From 499b902932eca2fd64a6618daa2ea6f5d5181af9 Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 11 Jun 2018 12:59:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?dlg=20=E9=85=8D=E4=B8=8B=E3=81=A7=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=82=A8=E3=83=B3=E3=82=B3=E3=83=BC=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=82=82=E6=94=AF=E9=9A=9C=E3=81=AA=E3=81=84=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92=20UTF-8=20=E3=81=AB=E5=8D=98?= =?UTF-8?q?=E7=B4=94=E5=A4=89=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cd sakura_core/dlg nkf --overwrite --oc=UTF-8-BOM *.cpp nkf --overwrite --oc=UTF-8-BOM *.h git checkout CDlgPluginOption.cpp git chcekout CDlgFavorite.cpp git checkout CDlgCtrlCode.cpp git checkout CDlgOpenFile.cpp --- sakura_core/dlg/CDialog.cpp | 172 ++++++------ sakura_core/dlg/CDialog.h | 44 +-- sakura_core/dlg/CDlgAbout.cpp | 122 ++++----- sakura_core/dlg/CDlgAbout.h | 18 +- sakura_core/dlg/CDlgCancel.cpp | 26 +- sakura_core/dlg/CDlgCancel.h | 36 +-- sakura_core/dlg/CDlgCompare.cpp | 94 +++---- sakura_core/dlg/CDlgCompare.h | 18 +- sakura_core/dlg/CDlgCtrlCode.h | 22 +- sakura_core/dlg/CDlgDiff.cpp | 132 ++++----- sakura_core/dlg/CDlgDiff.h | 34 +-- sakura_core/dlg/CDlgExec.cpp | 104 +++---- sakura_core/dlg/CDlgExec.h | 20 +- sakura_core/dlg/CDlgFavorite.cpp | 214 +++++++-------- sakura_core/dlg/CDlgFavorite.h | 50 ++-- sakura_core/dlg/CDlgFileUpdateQuery.cpp | 18 +- sakura_core/dlg/CDlgFileUpdateQuery.h | 16 +- sakura_core/dlg/CDlgFind.cpp | 206 +++++++------- sakura_core/dlg/CDlgFind.h | 30 +-- sakura_core/dlg/CDlgGrep.cpp | 302 ++++++++++----------- sakura_core/dlg/CDlgGrep.h | 48 ++-- sakura_core/dlg/CDlgGrepReplace.cpp | 90 +++---- sakura_core/dlg/CDlgGrepReplace.h | 20 +- sakura_core/dlg/CDlgInput1.cpp | 52 ++-- sakura_core/dlg/CDlgInput1.h | 34 +-- sakura_core/dlg/CDlgJump.cpp | 104 +++---- sakura_core/dlg/CDlgJump.h | 22 +- sakura_core/dlg/CDlgOpenFile.h | 46 ++-- sakura_core/dlg/CDlgPluginOption.h | 38 +-- sakura_core/dlg/CDlgPrintSetting.cpp | 328 +++++++++++------------ sakura_core/dlg/CDlgPrintSetting.h | 34 +-- sakura_core/dlg/CDlgProfileMgr.cpp | 40 +-- sakura_core/dlg/CDlgProfileMgr.h | 14 +- sakura_core/dlg/CDlgProperty.cpp | 36 +-- sakura_core/dlg/CDlgProperty.h | 16 +- sakura_core/dlg/CDlgReplace.cpp | 310 ++++++++++----------- sakura_core/dlg/CDlgReplace.h | 52 ++-- sakura_core/dlg/CDlgSetCharSet.cpp | 60 ++--- sakura_core/dlg/CDlgSetCharSet.h | 20 +- sakura_core/dlg/CDlgTagJumpList.cpp | 342 ++++++++++++------------ sakura_core/dlg/CDlgTagJumpList.h | 74 ++--- sakura_core/dlg/CDlgTagsMake.cpp | 54 ++-- sakura_core/dlg/CDlgTagsMake.h | 20 +- sakura_core/dlg/CDlgWinSize.cpp | 60 ++--- sakura_core/dlg/CDlgWinSize.h | 20 +- sakura_core/dlg/CDlgWindowList.cpp | 14 +- sakura_core/dlg/CDlgWindowList.h | 4 +- 47 files changed, 1815 insertions(+), 1815 deletions(-) diff --git a/sakura_core/dlg/CDialog.cpp b/sakura_core/dlg/CDialog.cpp index e0b6180da0..2e9f386347 100644 --- a/sakura_core/dlg/CDialog.cpp +++ b/sakura_core/dlg/CDialog.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief Dialog Box‚ÌŠî’êƒNƒ‰ƒX +/*! @file + @brief Dialog Boxã®åŸºåº•ã‚¯ãƒ©ã‚¹ @author Norio Nakatani */ @@ -28,7 +28,7 @@ #include "util/shell.h" #include "util/module.h" -/* ƒ_ƒCƒAƒƒOƒvƒƒV[ƒWƒƒ */ +/* ダイアログプロシージャ */ INT_PTR CALLBACK MyDialogProc( HWND hwndDlg, // handle to dialog box UINT uMsg, // message @@ -57,19 +57,19 @@ INT_PTR CALLBACK MyDialogProc( } -/*! ƒRƒ“ƒXƒgƒ‰ƒNƒ^ +/*! コンストラクタ - @date 2002.2.17 YAZAKI CShareData‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ÍACProcess‚ɂЂƂ‚ ‚é‚Ì‚ÝB + @date 2002.2.17 YAZAKI CShareDataã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€CProcessã«ã²ã¨ã¤ã‚ã‚‹ã®ã¿ã€‚ */ CDialog::CDialog(bool bSizable, bool bCheckShareData) { // MYTRACE( _T("CDialog::CDialog()\n") ); - /* ‹¤—Lƒf[ƒ^\‘¢‘̂̃AƒhƒŒƒX‚ð•Ô‚· */ + /* 共有データ構造体ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’返㙠*/ m_pShareData = &GetDllShareData(bCheckShareData); - m_hInstance = NULL; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - m_hwndParent = NULL; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ - m_hWnd = NULL; /* ‚±‚̃_ƒCƒAƒƒO‚̃nƒ“ƒhƒ‹ */ + m_hInstance = NULL; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hwndParent = NULL; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hWnd = NULL; /* ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®ãƒãƒ³ãƒ‰ãƒ« */ m_hwndSizeBox = NULL; m_bSizable = bSizable; m_lParam = (LPARAM)NULL; @@ -89,21 +89,21 @@ CDialog::~CDialog() return; } -//! ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ +//! モーダルダイアログã®è¡¨ç¤º /*! - @param hInstance [in] ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ - @param hwndParent [in] ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ + @param hInstance [in] アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« + @param hwndParent [in] オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« - @date 2011.04.10 nasukoji Še‘ŒêƒƒbƒZ[ƒWƒŠƒ\[ƒX‘Ήž + @date 2011.04.10 nasukoji å„国語メッセージリソース対応 */ INT_PTR CDialog::DoModal( HINSTANCE hInstance, HWND hwndParent, int nDlgTemplete, LPARAM lParam ) { m_bInited = FALSE; m_bModal = TRUE; - m_hInstance = hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - m_hwndParent = hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ + m_hInstance = hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hwndParent = hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ m_lParam = lParam; - m_hLangRsrcInstance = CSelectLang::getLangRsrcInstance(); // ƒƒbƒZ[ƒWƒŠƒ\[ƒXDLL‚̃Cƒ“ƒXƒ^ƒ“ƒXƒnƒ“ƒhƒ‹ + m_hLangRsrcInstance = CSelectLang::getLangRsrcInstance(); // メッセージリソースDLLã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãƒãƒ³ãƒ‰ãƒ« return ::DialogBoxParam( m_hLangRsrcInstance, MAKEINTRESOURCE( nDlgTemplete ), @@ -113,21 +113,21 @@ INT_PTR CDialog::DoModal( HINSTANCE hInstance, HWND hwndParent, int nDlgTemplete ); } -//! ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ +//! モードレスダイアログã®è¡¨ç¤º /*! - @param hInstance [in] ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ - @param hwndParent [in] ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ + @param hInstance [in] アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« + @param hwndParent [in] オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« - @date 2011.04.10 nasukoji Še‘ŒêƒƒbƒZ[ƒWƒŠƒ\[ƒX‘Ήž + @date 2011.04.10 nasukoji å„国語メッセージリソース対応 */ HWND CDialog::DoModeless( HINSTANCE hInstance, HWND hwndParent, int nDlgTemplete, LPARAM lParam, int nCmdShow ) { m_bInited = FALSE; m_bModal = FALSE; - m_hInstance = hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - m_hwndParent = hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ + m_hInstance = hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hwndParent = hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ m_lParam = lParam; - m_hLangRsrcInstance = CSelectLang::getLangRsrcInstance(); // ƒƒbƒZ[ƒWƒŠƒ\[ƒXDLL‚̃Cƒ“ƒXƒ^ƒ“ƒXƒnƒ“ƒhƒ‹ + m_hLangRsrcInstance = CSelectLang::getLangRsrcInstance(); // メッセージリソースDLLã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãƒãƒ³ãƒ‰ãƒ« m_hWnd = ::CreateDialogParam( m_hLangRsrcInstance, MAKEINTRESOURCE( nDlgTemplete ), @@ -145,8 +145,8 @@ HWND CDialog::DoModeless( HINSTANCE hInstance, HWND hwndParent, LPCDLGTEMPLATE l { m_bInited = FALSE; m_bModal = FALSE; - m_hInstance = hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - m_hwndParent = hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ + m_hInstance = hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hwndParent = hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ m_lParam = lParam; m_hWnd = ::CreateDialogIndirectParam( m_hInstance, @@ -182,7 +182,7 @@ BOOL CDialog::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // Modified by KEITA for WIN64 2003.9.6 ::SetWindowLongPtr( m_hWnd, DWLP_USER, lParam ); - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + /* ダイアログデータã®è¨­å®š */ SetData(); SetDialogPosSize(); @@ -194,7 +194,7 @@ BOOL CDialog::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) void CDialog::SetDialogPosSize() { #if 0 - /* ƒ_ƒCƒAƒƒO‚̃TƒCƒYAˆÊ’u‚ÌÄŒ» */ + /* ダイアログã®ã‚µã‚¤ã‚ºã€ä½ç½®ã®å†ç¾ */ if( -1 != m_xPos && -1 != m_yPos ){ ::SetWindowPos( m_hWnd, NULL, m_xPos, m_yPos, 0, 0, SWP_NOSIZE | SWP_NOOWNERZORDER | SWP_NOZORDER ); DEBUG_TRACE( _T("CDialog::OnInitDialog() m_xPos=%d m_yPos=%d\n"), m_xPos, m_yPos ); @@ -205,8 +205,8 @@ void CDialog::SetDialogPosSize() #endif if( -1 != m_xPos && -1 != m_yPos ){ - /* ƒEƒBƒ“ƒhƒEˆÊ’uEƒTƒCƒY‚ðÄŒ» */ - // 2014.11.28 ƒtƒHƒ“ƒg•ÏX‘Ήž + /* ウィンドウä½ç½®ãƒ»ã‚µã‚¤ã‚ºã‚’å†ç¾ */ + // 2014.11.28 フォント変更対応 if( m_nWidth == -1 && m_nHeight == -1 ){ RECT rc; ::GetWindowRect( m_hWnd, &rc ); @@ -216,12 +216,12 @@ void CDialog::SetDialogPosSize() if( !(::GetWindowLongPtr( m_hWnd, GWL_STYLE ) & WS_CHILD) ){ // 2006.06.09 ryoji - // ƒ‚ƒjƒ^‚̃[ƒN—̈æ‚æ‚è‚ඉE㉺‚É‚Pƒhƒbƒg¬‚³‚¢—̈æ“à‚É‘S‘Ì‚ªŽû‚Ü‚é‚悤‚Ɉʒu’²®‚·‚é + // モニタã®ãƒ¯ãƒ¼ã‚¯é ˜åŸŸã‚ˆã‚Šã‚‚å·¦å³ä¸Šä¸‹ã«ï¼‘ドットå°ã•ã„領域内ã«å…¨ä½“ãŒåŽã¾ã‚‹ã‚ˆã†ã«ä½ç½®èª¿æ•´ã™ã‚‹ // - // note: ƒ_ƒCƒAƒƒO‚ðƒ[ƒN—̈拫ŠE‚É‚Ò‚Á‚½‚臂킹‚悤‚Æ‚·‚é‚ÆA - // ‹­§“I‚Ée‚Ì’†‰›‚Ɉړ®‚³‚¹‚ç‚ê‚Ä‚µ‚Ü‚¤‚Æ‚«‚ª‚ ‚é - // iƒ}ƒ‹ƒ`ƒ‚ƒjƒ^ŠÂ‹«‚Åe‚ª”ñƒvƒ‰ƒCƒ}ƒŠƒ‚ƒjƒ^‚É‚ ‚éꇂ¾‚¯Hj - // 󋵂ɇ‚킹‚Ĉ—‚ð•Ï‚¦‚é‚Ì‚Í–ï‰î‚È‚Ì‚ÅAˆê—¥A‚Pƒhƒbƒg‚Ì‹ó‚«‚ð“ü‚ê‚é + // note: ダイアログをワーク領域境界ã«ã´ã£ãŸã‚Šåˆã‚ã›ã‚ˆã†ã¨ã™ã‚‹ã¨ã€ + // 強制的ã«è¦ªã®ä¸­å¤®ã«ç§»å‹•ã•ã›ã‚‰ã‚Œã¦ã—ã¾ã†ã¨ããŒã‚ã‚‹ + // （マルãƒãƒ¢ãƒ‹ã‚¿ç’°å¢ƒã§è¦ªãŒéžãƒ—ライマリモニタã«ã‚ã‚‹å ´åˆã ã‘？） + // 状æ³ã«åˆã‚ã›ã¦å‡¦ç†ã‚’変ãˆã‚‹ã®ã¯åŽ„介ãªã®ã§ã€ä¸€å¾‹ã€ï¼‘ドットã®ç©ºãを入れる RECT rc; RECT rcWork; @@ -258,7 +258,7 @@ void CDialog::SetDialogPosSize() WINDOWPLACEMENT cWindowPlacement; cWindowPlacement.length = sizeof( cWindowPlacement ); - cWindowPlacement.showCmd = m_nShowCmd; // ő剻EŬ‰» + cWindowPlacement.showCmd = m_nShowCmd; // 最大化・最å°åŒ– cWindowPlacement.rcNormalPosition.left = m_xPos; cWindowPlacement.rcNormalPosition.top = m_yPos; cWindowPlacement.rcNormalPosition.right = m_nWidth + m_xPos; @@ -269,11 +269,11 @@ void CDialog::SetDialogPosSize() BOOL CDialog::OnDestroy( void ) { - /* ƒEƒBƒ“ƒhƒEˆÊ’uEƒTƒCƒY‚ð‹L‰¯ */ + /* ウィンドウä½ç½®ãƒ»ã‚µã‚¤ã‚ºã‚’記憶 */ WINDOWPLACEMENT cWindowPlacement; cWindowPlacement.length = sizeof( cWindowPlacement ); if (::GetWindowPlacement( m_hWnd, &cWindowPlacement )){ - m_nShowCmd = cWindowPlacement.showCmd; // ő剻EŬ‰» + m_nShowCmd = cWindowPlacement.showCmd; // 最大化・最å°åŒ– m_xPos = cWindowPlacement.rcNormalPosition.left; m_yPos = cWindowPlacement.rcNormalPosition.top; m_nWidth = cWindowPlacement.rcNormalPosition.right - cWindowPlacement.rcNormalPosition.left; @@ -283,7 +283,7 @@ BOOL CDialog::OnDestroy( void ) m_nWidth = -1; m_nHeight = -1; } - /* ”jŠü */ + /* 破棄 */ if( NULL != m_hwndSizeBox ){ ::DestroyWindow( m_hwndSizeBox ); m_hwndSizeBox = NULL; @@ -314,27 +314,27 @@ BOOL CDialog::OnSize( WPARAM wParam, LPARAM lParam ) RECT rc; ::GetWindowRect( m_hWnd, &rc ); - /* ƒ_ƒCƒAƒƒO‚̃TƒCƒY‚Ì‹L‰¯ */ + /* ダイアログã®ã‚µã‚¤ã‚ºã®è¨˜æ†¶ */ m_xPos = rc.left; m_yPos = rc.top; m_nWidth = rc.right - rc.left; m_nHeight = rc.bottom - rc.top; - /* ƒTƒCƒYƒ{ƒbƒNƒX‚̈ړ® */ + /* サイズボックスã®ç§»å‹• */ if( NULL != m_hwndSizeBox ){ ::GetClientRect( m_hWnd, &rc ); // ::SetWindowPos( m_hwndSizeBox, NULL, -// Sept. 17, 2000 JEPRO_16thdot ƒAƒCƒRƒ“‚Ì16dot–Ú‚ª•\Ž¦‚³‚ê‚é‚悤‚ÉŽŸs‚ð•ÏX‚·‚é•K—v‚ ‚éH -// Jan. 12, 2001 JEPRO (directed by stonee) 15‚ð16‚É•ÏX‚·‚é‚ƃAƒEƒgƒ‰ƒCƒ“‰ð͂̃_ƒCƒAƒƒO‚̉E‰º‚É‚ ‚é -// ƒOƒŠƒbƒvƒTƒCƒY‚É`—V‚Ñ'‚ª‚Å‚«‚Ä‚µ‚Ü‚¢(ˆÚ“®‚·‚éI)Aƒ_ƒCƒAƒƒO‚ð‘å‚«‚­‚Å‚«‚È‚¢‚Æ‚¢‚¤áŠQ‚ª”­¶‚·‚é‚Ì‚Å -// •ÏX‚µ‚È‚¢‚±‚Æ‚É‚µ‚½(—v‚·‚é‚ÉŒ´ì”Å‚É–ß‚µ‚½‚¾‚¯) +// Sept. 17, 2000 JEPRO_16thdot アイコンã®16dotç›®ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«æ¬¡è¡Œã‚’変更ã™ã‚‹å¿…è¦ã‚る？ +// Jan. 12, 2001 JEPRO (directed by stonee) 15ã‚’16ã«å¤‰æ›´ã™ã‚‹ã¨ã‚¢ã‚¦ãƒˆãƒ©ã‚¤ãƒ³è§£æžã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®å³ä¸‹ã«ã‚ã‚‹ +// グリップサイズã«`éŠã³'ãŒã§ãã¦ã—ã¾ã„(移動ã™ã‚‹ï¼)ã€ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’大ããã§ããªã„ã¨ã„ã†éšœå®³ãŒç™ºç”Ÿã™ã‚‹ã®ã§ +// 変更ã—ãªã„ã“ã¨ã«ã—ãŸ(è¦ã™ã‚‹ã«åŽŸä½œç‰ˆã«æˆ»ã—ãŸã ã‘) // rc.right - rc.left - 15, rc.bottom - rc.top - 15, // 13, 13, // SWP_NOOWNERZORDER | SWP_NOZORDER // ); // Jan. 12, 2001 Stonee (suggested by genta) -// "13"‚Æ‚¢‚¤ŒÅ’è’l‚Å‚Í‚È‚­ƒVƒXƒeƒ€‚©‚çŽæ“¾‚µ‚½ƒXƒNƒ[ƒ‹ƒo[ƒTƒCƒY‚ðŽg‚¤‚悤‚ÉC³ +// "13"ã¨ã„ã†å›ºå®šå€¤ã§ã¯ãªãシステムã‹ã‚‰å–å¾—ã—ãŸã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ã‚µã‚¤ã‚ºã‚’使ã†ã‚ˆã†ã«ä¿®æ­£ ::SetWindowPos( m_hwndSizeBox, NULL, rc.right - rc.left - GetSystemMetrics(SM_CXVSCROLL), //<-- stonee rc.bottom - rc.top - GetSystemMetrics(SM_CYHSCROLL), //<-- stonee @@ -343,7 +343,7 @@ BOOL CDialog::OnSize( WPARAM wParam, LPARAM lParam ) SWP_NOOWNERZORDER | SWP_NOZORDER ); - // SizeBox–â‘èƒeƒXƒg + // SizeBoxå•é¡Œãƒ†ã‚¹ãƒˆ if( wParam == SIZE_MAXIMIZED ){ ::ShowWindow( m_hwndSizeBox, SW_HIDE ); }else{ @@ -358,14 +358,14 @@ BOOL CDialog::OnSize( WPARAM wParam, LPARAM lParam ) BOOL CDialog::OnMove( WPARAM wParam, LPARAM lParam ) { - /* ƒ_ƒCƒAƒƒO‚̈ʒu‚Ì‹L‰¯ */ + /* ダイアログã®ä½ç½®ã®è¨˜æ†¶ */ if( !m_bInited ){ return TRUE; } RECT rc; ::GetWindowRect( m_hWnd, &rc ); - /* ƒ_ƒCƒAƒƒO‚̃TƒCƒY‚Ì‹L‰¯ */ + /* ダイアログã®ã‚µã‚¤ã‚ºã®è¨˜æ†¶ */ m_xPos = rc.left; m_yPos = rc.top; m_nWidth = rc.right - rc.left; @@ -379,7 +379,7 @@ BOOL CDialog::OnMove( WPARAM wParam, LPARAM lParam ) void CDialog::CreateSizeBox( void ) { - /* ƒTƒCƒYƒ{ƒbƒNƒX */ + /* サイズボックス */ m_hwndSizeBox = ::CreateWindowEx( WS_EX_CONTROLPARENT, /* no extended styles */ _T("SCROLLBAR"), /* scroll bar control class */ @@ -403,7 +403,7 @@ void CDialog::CreateSizeBox( void ) -/* ƒ_ƒCƒAƒƒO‚̃ƒbƒZ[ƒWˆ— */ +/* ダイアログã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç† */ INT_PTR CDialog::DispatchEvent( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) { // DEBUG_TRACE( _T("CDialog::DispatchEvent() uMsg == %xh\n"), uMsg ); @@ -436,23 +436,23 @@ BOOL CDialog::OnCommand( WPARAM wParam, LPARAM lParam ) WORD wNotifyCode; WORD wID; HWND hwndCtl; - wNotifyCode = HIWORD(wParam); /* ’Ê’mƒR[ƒh */ - wID = LOWORD(wParam); /* €–ÚID¤ ƒRƒ“ƒgƒ[ƒ‹ID¤ ‚Ü‚½‚̓AƒNƒZƒ‰ƒŒ[ƒ^ID */ - hwndCtl = (HWND) lParam; /* ƒRƒ“ƒgƒ[ƒ‹‚̃nƒ“ƒhƒ‹ */ + wNotifyCode = HIWORD(wParam); /* 通知コード */ + wID = LOWORD(wParam); /* é …ç›®ID〠コントロールID〠ã¾ãŸã¯ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ID */ + hwndCtl = (HWND) lParam; /* コントロールã®ãƒãƒ³ãƒ‰ãƒ« */ TCHAR szClass[32]; - // IDOK ‚Æ IDCANCEL ‚̓{ƒ^ƒ“‚©‚ç‚Å‚È‚­‚Ä‚à“¯‚¶ˆµ‚¢ + // IDOK 㨠IDCANCEL ã¯ãƒœã‚¿ãƒ³ã‹ã‚‰ã§ãªãã¦ã‚‚åŒã˜æ‰±ã„ // MSDN [Windows Management] "Dialog Box Programming Considerations" if( wID == IDOK || wID == IDCANCEL ){ return OnBnClicked( wID ); } - // ’Ê’mŒ³‚ªƒRƒ“ƒgƒ[ƒ‹‚¾‚Á‚½ê‡‚̈— + // 通知元ãŒã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã ã£ãŸå ´åˆã®å‡¦ç† if( hwndCtl ){ ::GetClassName(hwndCtl, szClass, _countof(szClass)); if( ::lstrcmpi(szClass, _T("Button")) == 0 ){ switch( wNotifyCode ){ - /* ƒ{ƒ^ƒ“^ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ªƒNƒŠƒbƒN‚³‚ꂽ */ + /* ボタンï¼ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ãŒã‚¯ãƒªãƒƒã‚¯ã•ã‚ŒãŸ */ case BN_CLICKED: return OnBnClicked( wID ); } }else if( ::lstrcmpi(szClass, _T("Static")) == 0 ){ @@ -471,9 +471,9 @@ BOOL CDialog::OnCommand( WPARAM wParam, LPARAM lParam ) } }else if( ::lstrcmpi(szClass, _T("ComboBox")) == 0 ){ switch( wNotifyCode ){ - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX—pƒƒbƒZ[ƒW */ + /* コンボボックス用メッセージ */ case CBN_SELCHANGE: return OnCbnSelChange( hwndCtl, wID ); - // @@2005.03.31 MIK ƒ^ƒOƒWƒƒƒ“ƒvDialog‚ÅŽg‚¤‚̂ŒljÁ + // @@2005.03.31 MIK タグジャンプDialogã§ä½¿ã†ã®ã§è¿½åŠ  case CBN_EDITCHANGE: return OnCbnEditChange( hwndCtl, wID ); case CBN_DROPDOWN: return OnCbnDropDown( hwndCtl, wID ); // case CBN_CLOSEUP: return OnCbnCloseUp( hwndCtl, wID ); @@ -489,13 +489,13 @@ BOOL CDialog::OnCommand( WPARAM wParam, LPARAM lParam ) BOOL CDialog::OnPopupHelp( WPARAM wPara, LPARAM lParam ) { HELPINFO *p = (HELPINFO *)lParam; - MyWinHelp( (HWND)p->hItemHandle, HELP_WM_HELP, (ULONG_PTR)GetHelpIdTable() ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + MyWinHelp( (HWND)p->hItemHandle, HELP_WM_HELP, (ULONG_PTR)GetHelpIdTable() ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; } BOOL CDialog::OnContextMenu( WPARAM wPara, LPARAM lParam ) { - MyWinHelp( m_hWnd, HELP_CONTEXTMENU, (ULONG_PTR)GetHelpIdTable() ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + MyWinHelp( m_hWnd, HELP_CONTEXTMENU, (ULONG_PTR)GetHelpIdTable() ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; } @@ -511,26 +511,26 @@ LPVOID CDialog::GetHelpIdTable(void) BOOL CDialog::OnCbnSelEndOk( HWND hwndCtl, int wID ) { - //ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃ŠƒXƒg‚ð•\Ž¦‚µ‚½‚Ü‚Ü•¶Žš—ñ‚ð•ÒW‚µAEnterƒL[‚ð - //‰Ÿ‚·‚Æ•¶Žš—ñ‚ªÁ‚¦‚錻ۂ̑ÎôB - //EnterƒL[‚ð‰Ÿ‚µ‚Ä‚±‚ÌŠÖ”‚É“ü‚Á‚½‚çAƒŠƒXƒg‚ð”ñ•\Ž¦‚É‚µ‚Ä‚µ‚Ü‚¤B + //コンボボックスã®ãƒªã‚¹ãƒˆã‚’表示ã—ãŸã¾ã¾æ–‡å­—列を編集ã—ã€Enterキーを + //押ã™ã¨æ–‡å­—列ãŒæ¶ˆãˆã‚‹ç¾è±¡ã®å¯¾ç­–。 + //Enterキーを押ã—ã¦ã“ã®é–¢æ•°ã«å…¥ã£ãŸã‚‰ã€ãƒªã‚¹ãƒˆã‚’éžè¡¨ç¤ºã«ã—ã¦ã—ã¾ã†ã€‚ - //ƒŠƒXƒg‚ð”ñ•\Ž¦‚É‚·‚é‚Æ‘O•ûˆê’v‚·‚镶Žš—ñ‚ð‘I‚ñ‚Å‚µ‚Ü‚¤‚Ì‚ÅA - //Ž–‘O‚É•¶Žš—ñ‚ð‘Þ”ð‚µAƒŠƒXƒg”ñ•\Ž¦Œã‚É•œŒ³‚·‚éB + //リストをéžè¡¨ç¤ºã«ã™ã‚‹ã¨å‰æ–¹ä¸€è‡´ã™ã‚‹æ–‡å­—列をé¸ã‚“ã§ã—ã¾ã†ã®ã§ã€ + //事å‰ã«æ–‡å­—列を退é¿ã—ã€ãƒªã‚¹ãƒˆéžè¡¨ç¤ºå¾Œã«å¾©å…ƒã™ã‚‹ã€‚ int nLength; LPTSTR sBuf; - //•¶Žš—ñ‚ð‘Þ”ð + //æ–‡å­—åˆ—ã‚’é€€é¿ nLength = ::GetWindowTextLength( hwndCtl ); sBuf = new TCHAR[nLength + 1]; ::GetWindowText( hwndCtl, sBuf, nLength+1 ); sBuf[nLength] = _T('\0'); - //ƒŠƒXƒg‚ð”ñ•\Ž¦‚É‚·‚é + //リストをéžè¡¨ç¤ºã«ã™ã‚‹ Combo_ShowDropdown( hwndCtl, FALSE ); - //•¶Žš—ñ‚𕜌³E‘S‘I‘ð + //文字列を復元・全é¸æŠž ::SetWindowText( hwndCtl, sBuf ); Combo_SetEditSel( hwndCtl, 0, -1 ); delete[] sBuf; @@ -542,16 +542,16 @@ BOOL CDialog::OnCbnDropDown( HWND hwndCtl, int wID ) { return OnCbnDropDown( hwndCtl, false ); } -/** ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃hƒƒbƒvƒ_ƒEƒ“Žžˆ— +/** コンボボックスã®ãƒ‰ãƒ­ãƒƒãƒ—ãƒ€ã‚¦ãƒ³æ™‚å‡¦ç† - ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ªƒhƒƒbƒvƒ_ƒEƒ“‚³‚ê‚鎞‚É - ƒhƒƒbƒvƒ_ƒEƒ“ƒŠƒXƒg‚Ì•‚ðƒAƒCƒeƒ€•¶Žš—ñ‚ÌÅ‘å•\Ž¦•‚ɇ‚킹‚é + コンボボックスãŒãƒ‰ãƒ­ãƒƒãƒ—ダウンã•ã‚Œã‚‹æ™‚ã« + ドロップダウンリストã®å¹…をアイテム文字列ã®æœ€å¤§è¡¨ç¤ºå¹…ã«åˆã‚ã›ã‚‹ - @param hwndCtl [in] ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃EƒBƒ“ƒhƒEƒnƒ“ƒhƒ‹ - @param wID [in] ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ÌID + @param hwndCtl [in] コンボボックスã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒãƒ³ãƒ‰ãƒ« + @param wID [in] コンボボックスã®ID @author ryoji - @date 2009.03.29 V‹Kì¬ + @date 2009.03.29 æ–°è¦ä½œæˆ */ BOOL CDialog::OnCbnDropDown( HWND hwndCtl, bool scrollBar ) { @@ -597,14 +597,14 @@ bool CDialog::DirectoryUp( TCHAR* szDir ) { size_t nLen = auto_strlen( szDir ); if( 3 < nLen ){ - // X:\ ‚â\\. ‚æ‚è’·‚¢ + // X:\ ã‚„\\. より長ㄠCutLastYenFromDirectoryPath( szDir ); const TCHAR *p = GetFileTitlePointer(szDir); if( 0 < p - szDir){ if( 3 < p - szDir ){ - szDir[p - szDir - 1] = '\0'; // \‚ðí‚é‚Ì‚Å-1 + szDir[p - szDir - 1] = '\0'; // \を削るã®ã§-1 }else{ - // uC:\v‚Ì\‚ðŽc‚· + // 「C:\ã€ã®\を残㙠szDir[p - szDir] = '\0'; } } @@ -613,7 +613,7 @@ bool CDialog::DirectoryUp( TCHAR* szDir ) return false; } -// ƒRƒ“ƒgƒ[ƒ‹‚ɉæ–ʂ̃tƒHƒ“ƒg‚ðÝ’è 2012/11/27 Uchi +// コントロールã«ç”»é¢ã®ãƒ•ã‚©ãƒ³ãƒˆã‚’設定 2012/11/27 Uchi HFONT CDialog::SetMainFont( HWND hTarget ) { if (hTarget == NULL) return NULL; @@ -621,12 +621,12 @@ HFONT CDialog::SetMainFont( HWND hTarget ) HFONT hFont; LOGFONT lf; - // Ý’è‚·‚éƒtƒHƒ“ƒg‚Ì‚‚³‚ðŽæ“¾ + // 設定ã™ã‚‹ãƒ•ã‚©ãƒ³ãƒˆã®é«˜ã•ã‚’å–å¾— hFont = (HFONT)::SendMessage(hTarget, WM_GETFONT, 0, 0); GetObject(hFont, sizeof(lf), &lf); LONG nfHeight = lf.lfHeight; - // LOGFONT‚Ìì¬ + // LOGFONTã®ä½œæˆ lf = m_pShareData->m_Common.m_sView.m_lf; lf.lfHeight = nfHeight; lf.lfWidth = 0; @@ -637,16 +637,16 @@ HFONT CDialog::SetMainFont( HWND hTarget ) lf.lfUnderline = FALSE; lf.lfStrikeOut = FALSE; //lf.lfCharSet = lf.lfCharSet; - lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; // Raster Font ‚ðŽg‚í‚È‚¢‚悤‚É + lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; // Raster Font を使ã‚ãªã„よã†ã« //lf.lfClipPrecision = lf.lfClipPrecision; //lf.lfQuality = lf.lfQuality; //lf.lfPitchAndFamily = lf.lfPitchAndFamily; - //_tcsncpy( lf.lfFaceName, lf.lfFaceName, _countof(lf.lfFaceName)); // ‰æ–ʂ̃tƒHƒ“ƒg‚ÉÝ’è 2012/11/27 Uchi + //_tcsncpy( lf.lfFaceName, lf.lfFaceName, _countof(lf.lfFaceName)); // ç”»é¢ã®ãƒ•ã‚©ãƒ³ãƒˆã«è¨­å®š 2012/11/27 Uchi - // ƒtƒHƒ“ƒg‚ðì¬ + // ãƒ•ã‚©ãƒ³ãƒˆã‚’ä½œæˆ hFont = ::CreateFontIndirect(&lf); if (hFont) { - // ƒtƒHƒ“ƒg‚ÌÝ’è + // フォントã®è¨­å®š ::SendMessage(hTarget, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(FALSE, 0)); } return hFont; @@ -661,7 +661,7 @@ void CDialog::ResizeItem( HWND hTarget, const POINT& ptDlgDefault, const POINT& width = rcItemDefault.right - rcItemDefault.left; height = rcItemDefault.bottom - rcItemDefault.top; if( (anchor & (ANCHOR_LEFT | ANCHOR_RIGHT)) == ANCHOR_LEFT ){ - // ‚È‚µ + // ãªã— } else if( (anchor & (ANCHOR_LEFT | ANCHOR_RIGHT)) == ANCHOR_RIGHT ){ /* @@ -682,7 +682,7 @@ void CDialog::ResizeItem( HWND hTarget, const POINT& ptDlgDefault, const POINT& } if( (anchor & (ANCHOR_TOP | ANCHOR_BOTTOM) ) == ANCHOR_TOP ){ - // ‚È‚µ + // ãªã— } else if( (anchor & (ANCHOR_TOP | ANCHOR_BOTTOM) ) == ANCHOR_BOTTOM ){ pt.y = rcItemDefault.top + (ptDlgNew.y - ptDlgDefault.y); diff --git a/sakura_core/dlg/CDialog.h b/sakura_core/dlg/CDialog.h index 7990673b15..05b272909e 100644 --- a/sakura_core/dlg/CDialog.h +++ b/sakura_core/dlg/CDialog.h @@ -1,5 +1,5 @@ -/*! @file - @brief Dialog BoxŠî’êƒNƒ‰ƒXƒwƒbƒ_ƒtƒ@ƒCƒ‹ +/*! @file + @brief Dialog Box基底クラスヘッダファイル @author Norio Nakatani */ @@ -62,14 +62,14 @@ struct SComboBoxItemDeleter }; /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ /*! - @brief ƒ_ƒCƒAƒƒOƒEƒBƒ“ƒhƒE‚ðˆµ‚¤ƒNƒ‰ƒX + @brief ダイアログウィンドウを扱ã†ã‚¯ãƒ©ã‚¹ - ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX‚ðì‚é‚Æ‚«‚É‚Í‚±‚±‚©‚çŒp³‚³‚¹‚éD + ダイアログボックスを作るã¨ãã«ã¯ã“ã“ã‹ã‚‰ç¶™æ‰¿ã•ã›ã‚‹ï¼Ž - @date 2002.2.17 YAZAKI CShareData‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ÍACProcess‚ɂЂƂ‚ ‚é‚Ì‚ÝB + @date 2002.2.17 YAZAKI CShareDataã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€CProcessã«ã²ã¨ã¤ã‚ã‚‹ã®ã¿ã€‚ */ class CDialog { @@ -82,10 +82,10 @@ class CDialog /* || Attributes & Operations */ - virtual INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ƒ_ƒCƒAƒƒO‚̃ƒbƒZ[ƒWˆ— */ - INT_PTR DoModal( HINSTANCE, HWND, int, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - HWND DoModeless( HINSTANCE, HWND, int, LPARAM, int ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - HWND DoModeless( HINSTANCE, HWND, LPCDLGTEMPLATE, LPARAM, int ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + virtual INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ダイアログã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç† */ + INT_PTR DoModal( HINSTANCE, HWND, int, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ + HWND DoModeless( HINSTANCE, HWND, int, LPARAM, int ); /* モードレスダイアログã®è¡¨ç¤º */ + HWND DoModeless( HINSTANCE, HWND, LPCDLGTEMPLATE, LPARAM, int ); /* モードレスダイアログã®è¡¨ç¤º */ void CloseDialog( INT_PTR ); virtual BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ); @@ -99,8 +99,8 @@ class CDialog virtual BOOL OnTimer( WPARAM wParam ){return TRUE;} virtual BOOL OnKeyDown( WPARAM wParam, LPARAM lParam ){return TRUE;} virtual BOOL OnDeviceChange( WPARAM wParam, LPARAM lParam ){return TRUE;} - virtual int GetData( void ){return 1;}/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - virtual void SetData( void ){return;}/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + virtual int GetData( void ){return 1;}/* ダイアログデータã®å–å¾— */ + virtual void SetData( void ){return;}/* ダイアログデータã®è¨­å®š */ virtual BOOL OnBnClicked( int ); virtual BOOL OnStnClicked( int ){return FALSE;} virtual BOOL OnEnChange( HWND hwndCtl, int wID ){return FALSE;} @@ -108,7 +108,7 @@ class CDialog virtual BOOL OnLbnSelChange( HWND hwndCtl, int wID ){return FALSE;} virtual BOOL OnLbnDblclk( int wID ){return FALSE;} virtual BOOL OnCbnSelChange( HWND hwndCtl, int wID ){return FALSE;} - virtual BOOL OnCbnEditChange( HWND hwndCtl, int wID ){return FALSE;} // @@2005.03.31 MIK ƒ^ƒOƒWƒƒƒ“ƒvDialog + virtual BOOL OnCbnEditChange( HWND hwndCtl, int wID ){return FALSE;} // @@2005.03.31 MIK タグジャンプDialog virtual BOOL OnCbnDropDown( HWND hwndCtl, int wID ); static BOOL OnCbnDropDown( HWND hwndCtl, bool scrollBar ); // virtual BOOL OnCbnCloseUp( HWND hwndCtl, int wID ){return FALSE;} @@ -131,20 +131,20 @@ class CDialog public: HWND GetHwnd() const{ return m_hWnd; } - //“ÁŽêƒCƒ“ƒ^[ƒtƒF[ƒX (Žg—p‚ÍD‚Ü‚µ‚­‚È‚¢) + //特殊インターフェース (使用ã¯å¥½ã¾ã—ããªã„) void _SetHwnd(HWND hwnd){ m_hWnd = hwnd; } public: - HINSTANCE m_hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - HWND m_hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ + HINSTANCE m_hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + HWND m_hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ private: - HWND m_hWnd; /* ‚±‚̃_ƒCƒAƒƒO‚̃nƒ“ƒhƒ‹ */ + HWND m_hWnd; /* ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®ãƒãƒ³ãƒ‰ãƒ« */ public: HWND m_hwndSizeBox; LPARAM m_lParam; - BOOL m_bModal; /* ƒ‚[ƒ_ƒ‹ ƒ_ƒCƒAƒƒO‚© */ - bool m_bSizable; // ‰Â•Ïƒ_ƒCƒAƒƒO‚©‚Ç‚¤‚© - int m_nShowCmd; // ő剻/Ŭ‰» + BOOL m_bModal; /* モーダル ダイアログ㋠*/ + bool m_bSizable; // å¯å¤‰ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‹ã©ã†ã‹ + int m_nShowCmd; // 最大化/最å°åŒ– int m_nWidth; int m_nHeight; int m_xPos; @@ -152,7 +152,7 @@ class CDialog // void* m_pcEditView; DLLSHAREDATA* m_pShareData; BOOL m_bInited; - HINSTANCE m_hLangRsrcInstance; // ƒƒbƒZ[ƒWƒŠƒ\[ƒXDLL‚̃Cƒ“ƒXƒ^ƒ“ƒXƒnƒ“ƒhƒ‹ // 2011.04.10 nasukoji + HINSTANCE m_hLangRsrcInstance; // メッセージリソースDLLã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãƒãƒ³ãƒ‰ãƒ« // 2011.04.10 nasukoji protected: void CreateSizeBox( void ); @@ -160,7 +160,7 @@ class CDialog HWND GetItemHwnd(int nID){ return ::GetDlgItem( GetHwnd(), nID ); } - // ƒRƒ“ƒgƒ[ƒ‹‚ɉæ–ʂ̃tƒHƒ“ƒg‚ðÝ’è 2012/11/27 Uchi + // コントロールã«ç”»é¢ã®ãƒ•ã‚©ãƒ³ãƒˆã‚’設定 2012/11/27 Uchi HFONT SetMainFont( HWND hTarget ); }; diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 5de6a547f4..4dcedc26da 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -1,8 +1,8 @@ -/*! @file - @brief ƒo[ƒWƒ‡ƒ“î•ñƒ_ƒCƒAƒƒO +/*! @file + @brief ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報ダイアログ @author Norio Nakatani - @date 1998/3/13 ì¬ + @date 1998/3/13 ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -25,10 +25,10 @@ #include "util/file.h" #include "util/module.h" #include "gitrev.h" -#include "sakura_rc.h" // 2002/2/10 aroka •œ‹A +#include "sakura_rc.h" // 2002/2/10 aroka 復帰 #include "sakura.hh" -// ƒo[ƒWƒ‡ƒ“î•ñ CDlgAbout.cpp //@@@ 2002.01.07 add start MIK +// ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ± CDlgAbout.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12900 IDOK, HIDOK_ABOUT, IDC_EDIT_ABOUT, HIDC_ABOUT_EDIT_ABOUT, @@ -41,8 +41,8 @@ const DWORD p_helpids[] = { //12900 }; //@@@ 2002.01.07 add end MIK // From Here Feb. 7, 2002 genta -// 2006.01.17 Moca COMPILER_VER‚ð’ljÁ -// 2010.04.15 Moca icc/dmc‚ð’ljÁ‚µCPU‚𕪗£ +// 2006.01.17 Moca COMPILER_VERを追加 +// 2010.04.15 Moca icc/dmcを追加ã—CPUを分離 #if defined(_M_IA64) # define TARGET_M_SUFFIX "_I64" #elif defined(_M_AMD64) @@ -100,7 +100,7 @@ const DWORD p_helpids[] = { //12900 // From Here Nov. 7, 2000 genta /*! - •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ */ INT_PTR CDlgAbout::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { @@ -109,7 +109,7 @@ INT_PTR CDlgAbout::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lP switch( wMsg ){ case WM_CTLCOLORDLG: case WM_CTLCOLORSTATIC: - // EDIT‚à READONLY ‚© DISABLE‚Ìê‡ WM_CTLCOLORSTATIC ‚É‚È‚è‚Ü‚· + // EDITã‚‚ READONLY ã‹ DISABLEã®å ´åˆ WM_CTLCOLORSTATIC ã«ãªã‚Šã¾ã™ if( (HWND)lParam == GetDlgItem(hWnd, IDC_EDIT_ABOUT) ){ ::SetTextColor( (HDC)wParam, RGB( 102, 102, 102 ) ); } else { @@ -121,16 +121,16 @@ INT_PTR CDlgAbout::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lP } // To Here Nov. 7, 2000 genta -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgAbout::DoModal( HINSTANCE hInstance, HWND hwndParent ) { return (int)CDialog::DoModal( hInstance, hwndParent, IDD_ABOUT, (LPARAM)NULL ); } -/*! ‰Šú‰»ˆ— - @date 2008.05.05 novice GetModuleHandle(NULL)¨NULL‚É•ÏX - @date 2011.04.10 nasukoji Še‘ŒêƒƒbƒZ[ƒWƒŠƒ\[ƒX‘Ήž - @date 2013.04.07 novice svn revision î•ñ’ljÁ +/*! åˆæœŸåŒ–å‡¦ç† + @date 2008.05.05 novice GetModuleHandle(NULL)→NULLã«å¤‰æ›´ + @date 2011.04.10 nasukoji å„国語メッセージリソース対応 + @date 2013.04.07 novice svn revision 情報追加 */ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { @@ -139,31 +139,31 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) TCHAR szMsg[2048]; TCHAR szFile[_MAX_PATH]; - /* ‚±‚ÌŽÀsƒtƒ@ƒCƒ‹‚Ìî•ñ */ + /* ã“ã®å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ã®æƒ…å ± */ ::GetModuleFileName( NULL, szFile, _countof( szFile ) ); - // Oct. 22, 2005 genta ƒ^ƒCƒ€ƒXƒ^ƒ“ƒvŽæ“¾‚Ì‹¤’ÊŠÖ”—˜—p + // Oct. 22, 2005 genta タイムスタンプå–å¾—ã®å…±é€šé–¢æ•°åˆ©ç”¨ - /* ƒo[ƒWƒ‡ƒ“î•ñ */ - // Nov. 6, 2000 genta Unofficial Release‚̃o[ƒWƒ‡ƒ“‚Æ‚µ‚ÄÝ’è - // Jun. 8, 2001 genta GPL‰»‚É”º‚¢AOfficial‚ÈRelease‚Æ‚µ‚Ä‚Ì“¹‚ð•à‚ÝŽn‚ß‚é - // Feb. 7, 2002 genta ƒRƒ“ƒpƒCƒ‰î•ñ’ljÁ - // 2004.05.13 Moca ƒo[ƒWƒ‡ƒ“”Ô†‚ÍAƒvƒƒZƒX‚²‚ƂɎ擾‚·‚é - // 2010.04.15 Moca ƒRƒ“ƒpƒCƒ‰î•ñ‚𕪗£/WINƒwƒbƒ_,N_SHAREDATA_VERSION’ljÁ + /* ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ± */ + // Nov. 6, 2000 genta Unofficial Releaseã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ã—ã¦è¨­å®š + // Jun. 8, 2001 genta GPL化ã«ä¼´ã„ã€OfficialãªReleaseã¨ã—ã¦ã®é“ã‚’æ­©ã¿å§‹ã‚ã‚‹ + // Feb. 7, 2002 genta コンパイラ情報追加 + // 2004.05.13 Moca ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã¯ã€ãƒ—ロセスã”ã¨ã«å–å¾—ã™ã‚‹ + // 2010.04.15 Moca コンパイラ情報を分離/WINヘッダ,N_SHAREDATA_VERSION追加 - // ˆÈ‰º‚ÌŒ`Ž®‚Åo—Í - //ƒTƒNƒ‰ƒGƒfƒBƒ^ Ver. 2.0.0.0 + // 以下ã®å½¢å¼ã§å‡ºåŠ› + //サクラエディタ Ver. 2.0.0.0 //(GitHash xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) // // Share Ver: 96 // Compile Info: V 1400 WR WIN600/I601/C000/N600 // Last Modified: 1999/9/9 00:00:00 - // (‚ ‚ê‚ÎSKR_PATCH_INFO‚Ì•¶Žš—ñ‚ª‚»‚Ì‚Ü‚Ü•\Ž¦) + // (ã‚ã‚Œã°SKR_PATCH_INFOã®æ–‡å­—列ãŒãã®ã¾ã¾è¡¨ç¤º) CNativeT cmemMsg; cmemMsg.AppendString(LS(STR_DLGABOUT_APPNAME)); cmemMsg.AppendString(_T(" ")); - // ƒo[ƒWƒ‡ƒ“&ƒŠƒrƒWƒ‡ƒ“î•ñ + // ãƒãƒ¼ã‚¸ãƒ§ãƒ³&リビジョン情報 DWORD dwVersionMS, dwVersionLS; GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS ); #if defined(GIT_COMMIT_HASH) @@ -185,13 +185,13 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) cmemMsg.AppendString( _T("\r\n") ); - // ‹¤—Lƒƒ‚ƒŠî•ñ + // 共有メモリ情報 auto_sprintf( szMsg, _T(" Share Ver: %3d\r\n"), N_SHAREDATA_VERSION ); cmemMsg.AppendString( szMsg ); - // ƒRƒ“ƒpƒCƒ‹î•ñ + // コンパイル情報 cmemMsg.AppendString( _T(" Compile Info: ") ); int Compiler_ver = COMPILER_VER; auto_sprintf( szMsg, _T(COMPILER_TYPE) _T(TARGET_M_SUFFIX) _T("%d ") @@ -201,7 +201,7 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) ); cmemMsg.AppendString( szMsg ); - // XV“úî•ñ + // 更新日情報 CFileTime cFileTime; GetLastWriteTimestamp( szFile, &cFileTime ); auto_sprintf( szMsg, _T(" Last Modified: %d/%d/%d %02d:%02d:%02d\r\n"), @@ -214,7 +214,7 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) ); cmemMsg.AppendString( szMsg ); - // ƒpƒbƒ`‚Ìî•ñ‚ðƒRƒ“ƒpƒCƒ‹Žž‚É“n‚¹‚é‚悤‚É‚·‚é + // パッãƒã®æƒ…報をコンパイル時ã«æ¸¡ã›ã‚‹ã‚ˆã†ã«ã™ã‚‹ #ifdef SKR_PATCH_INFO cmemMsg.AppendString( _T(" ") ); const TCHAR* ptszPatchInfo = to_tchar(SKR_PATCH_INFO); @@ -226,8 +226,8 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) ::DlgItem_SetText( GetHwnd(), IDC_EDIT_VER, cmemMsg.GetStringPtr() ); // From Here Jun. 8, 2001 genta - // Edit Box‚ɃƒbƒZ[ƒW‚ð’ljÁ‚·‚éD - // 2011.06.01 nasukoji Še‘ŒêƒƒbƒZ[ƒWƒŠƒ\[ƒX‘Ήž + // Edit Boxã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’追加ã™ã‚‹ï¼Ž + // 2011.06.01 nasukoji å„国語メッセージリソース対応 LPCTSTR pszDesc = LS( IDS_ABOUT_DESCRIPTION ); if( _tcslen(pszDesc) > 0 ){ _tcsncpy( szMsg, pszDesc, _countof(szMsg) - 1 ); @@ -237,7 +237,7 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // To Here Jun. 8, 2001 genta // From Here Dec. 2, 2002 genta - // ƒAƒCƒRƒ“‚ðƒJƒXƒ^ƒ}ƒCƒYƒAƒCƒRƒ“‚ɇ‚킹‚é + // アイコンをカスタマイズアイコンã«åˆã‚ã›ã‚‹ HICON hIcon = GetAppIcon( m_hInstance, ICON_DEFAULT_APP, FN_APP_ICON, false ); HWND hIconWnd = GetDlgItem( GetHwnd(), IDC_STATIC_MYICON ); @@ -246,13 +246,13 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) } // To Here Dec. 2, 2002 genta - // URLƒEƒBƒ“ƒhƒE‚ðƒTƒuƒNƒ‰ƒX‰»‚·‚é + // URLウィンドウをサブクラス化ã™ã‚‹ m_UrlUrWnd.SetSubclassWindow( GetDlgItem( GetHwnd(), IDC_STATIC_URL_UR ) ); - // Oct. 22, 2005 genta Œ´ìŽÒƒz[ƒ€ƒy[ƒW‚ª–³‚­‚È‚Á‚½‚Ì‚Åíœ + // Oct. 22, 2005 genta 原作者ホームページãŒç„¡ããªã£ãŸã®ã§å‰Šé™¤ //m_UrlOrgWnd.SubclassWindow( GetDlgItem( GetHwnd(), IDC_STATIC_URL_ORG ) ); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnInitDialog( GetHwnd(), wParam, lParam ); } @@ -275,10 +275,10 @@ BOOL CDlgAbout::OnBnClicked( int wID ) BOOL CDlgAbout::OnStnClicked( int wID ) { switch( wID ){ - // 2006.07.27 genta Œ´ìŽÒ˜A—æ‚̃{ƒ^ƒ“‚ðíœ (ƒwƒ‹ƒv‚©‚ç휂³‚ê‚Ä‚¢‚邽‚ß) + // 2006.07.27 genta 原作者連絡先ã®ãƒœã‚¿ãƒ³ã‚’削除 (ヘルプã‹ã‚‰å‰Šé™¤ã•ã‚Œã¦ã„ã‚‹ãŸã‚) case IDC_STATIC_URL_UR: // case IDC_STATIC_URL_ORG: del 2008/7/4 Uchi - // Web Browser‚Ì‹N“® + // Web Browserã®èµ·å‹• { TCHAR buf[512]; ::GetWindowText( ::GetDlgItem( GetHwnd(), wID ), buf, _countof(buf) ); @@ -286,7 +286,7 @@ BOOL CDlgAbout::OnStnClicked( int wID ) return TRUE; } } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnStnClicked( wID ); } @@ -298,14 +298,14 @@ LPVOID CDlgAbout::GetHelpIdTable(void) BOOL CUrlWnd::SetSubclassWindow( HWND hWnd ) { - // STATICƒEƒBƒ“ƒhƒE‚ðƒTƒuƒNƒ‰ƒX‰»‚·‚é - // Œ³‚ÌSTATIC‚Í WS_TABSTOP, SS_NOTIFY ƒXƒ^ƒCƒ‹‚Ì‚à‚Ì‚ðŽg—p‚·‚邱‚Æ + // STATICウィンドウをサブクラス化ã™ã‚‹ + // å…ƒã®STATIC㯠WS_TABSTOP, SS_NOTIFY スタイルã®ã‚‚ã®ã‚’使用ã™ã‚‹ã“㨠if( GetHwnd() != NULL ) return FALSE; if( !IsWindow( hWnd ) ) return FALSE; - // ƒTƒuƒNƒ‰ƒX‰»‚ðŽÀs‚·‚é + // サブクラス化を実行ã™ã‚‹ LONG_PTR lptr; SetLastError( 0 ); lptr = SetWindowLongPtr( hWnd, GWLP_USERDATA, (LONG_PTR)this ); @@ -316,7 +316,7 @@ BOOL CUrlWnd::SetSubclassWindow( HWND hWnd ) return FALSE; m_hWnd = hWnd; - // ‰ºü•t‚«ƒtƒHƒ“ƒg‚É•ÏX‚·‚é + // 下線付ãフォントã«å¤‰æ›´ã™ã‚‹ HFONT hFont; LOGFONT lf; hFont = (HFONT)SendMessageAny( hWnd, WM_GETFONT, (WPARAM)0, (LPARAM)0 ); @@ -339,27 +339,27 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM switch ( msg ) { case WM_SETCURSOR: - // ƒJ[ƒ\ƒ‹Œ`ó•ÏX - SetHandCursor(); // Hand Cursor‚ðÝ’è 2013/1/29 Uchi + // カーソル形状変更 + SetHandCursor(); // Hand Cursorを設定 2013/1/29 Uchi return (LRESULT)0; case WM_LBUTTONDOWN: - // ƒL[ƒ{[ƒhƒtƒH[ƒJƒX‚ðŽ©•ª‚É“–‚Ä‚é + // キーボードフォーカスを自分ã«å½“ã¦ã‚‹ SendMessageAny( GetParent(hWnd), WM_NEXTDLGCTL, (WPARAM)hWnd, (LPARAM)1 ); break; case WM_SETFOCUS: case WM_KILLFOCUS: - // Ä•`‰æ + // å†æç”» InvalidateRect( hWnd, NULL, TRUE ); UpdateWindow( hWnd ); break; case WM_GETDLGCODE: - // ƒfƒtƒHƒ‹ƒgƒvƒbƒVƒ…ƒ{ƒ^ƒ“‚̂悤‚ÉU•‘‚¤iEnterƒL[‚Ì—LŒø‰»j - // •ûŒüƒL[‚Í–³Œø‰»iIE‚̃o[ƒWƒ‡ƒ“î•ñƒ_ƒCƒAƒƒO‚Æ“¯—lj + // デフォルトプッシュボタンã®ã‚ˆã†ã«æŒ¯èˆžã†ï¼ˆEnterキーã®æœ‰åŠ¹åŒ–） + // æ–¹å‘キーã¯ç„¡åŠ¹åŒ–（IEã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報ダイアログã¨åŒæ§˜ï¼‰ return DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS; case WM_MOUSEMOVE: - // ƒJ[ƒ\ƒ‹‚ªƒEƒBƒ“ƒhƒE“à‚É“ü‚Á‚½‚çƒ^ƒCƒ}[‹N“® - // ƒEƒBƒ“ƒhƒEŠO‚Éo‚½‚çƒ^ƒCƒ}[íœ - // Šeƒ^ƒCƒ~ƒ“ƒO‚ÅÄ•`‰æ + // カーソルãŒã‚¦ã‚£ãƒ³ãƒ‰ã‚¦å†…ã«å…¥ã£ãŸã‚‰ã‚¿ã‚¤ãƒžãƒ¼èµ·å‹• + // ウィンドウ外ã«å‡ºãŸã‚‰ã‚¿ã‚¤ãƒžãƒ¼å‰Šé™¤ + // å„タイミングã§å†æç”» BOOL bHilighted; pt.x = LOWORD( lParam ); pt.y = HIWORD( lParam ); @@ -375,7 +375,7 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM } break; case WM_TIMER: - // ƒJ[ƒ\ƒ‹‚ªƒEƒBƒ“ƒhƒEŠO‚É‚ ‚éꇂɂà WM_MOUSEMOVE ‚ð‘—‚é + // カーソルãŒã‚¦ã‚£ãƒ³ãƒ‰ã‚¦å¤–ã«ã‚ã‚‹å ´åˆã«ã‚‚ WM_MOUSEMOVE ã‚’é€ã‚‹ GetCursorPos( &pt ); ScreenToClient( hWnd, &pt ); GetClientRect( hWnd, &rc ); @@ -383,7 +383,7 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM SendMessageAny( hWnd, WM_MOUSEMOVE, 0, MAKELONG( pt.x, pt.y ) ); break; case WM_PAINT: - // ƒEƒBƒ“ƒhƒE‚Ì•`‰æ + // ウィンドウã®æç”» PAINTSTRUCT ps; HFONT hFont; HFONT hFontOld; @@ -391,19 +391,19 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM hdc = BeginPaint( hWnd, &ps ); - // Œ»Ý‚̃Nƒ‰ƒCƒAƒ“ƒg‹éŒ`AƒeƒLƒXƒgAƒtƒHƒ“ƒg‚ðŽæ“¾‚·‚é + // ç¾åœ¨ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆçŸ©å½¢ã€ãƒ†ã‚­ã‚¹ãƒˆã€ãƒ•ã‚©ãƒ³ãƒˆã‚’å–å¾—ã™ã‚‹ GetClientRect( hWnd, &rc ); GetWindowText( hWnd, szText, _countof(szText) ); hFont = (HFONT)SendMessageAny( hWnd, WM_GETFONT, (WPARAM)0, (LPARAM)0 ); - // ƒeƒLƒXƒg•`‰æ + // テキストæç”» SetBkMode( hdc, TRANSPARENT ); SetTextColor( hdc, pUrlWnd->m_bHilighted? RGB( 0x84, 0, 0 ): RGB( 0, 0, 0xff ) ); hFontOld = (HFONT)SelectObject( hdc, (HGDIOBJ)hFont ); TextOut( hdc, 2, 0, szText, _tcslen( szText ) ); SelectObject( hdc, (HGDIOBJ)hFontOld ); - // ƒtƒH[ƒJƒX˜g•`‰æ + // フォーカス枠æç”» if( GetFocus() == hWnd ) DrawFocusRect( hdc, &rc ); @@ -413,13 +413,13 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM hdc = (HDC)wParam; GetClientRect( hWnd, &rc ); - // ”wŒi•`‰æ + // 背景æç”» if( pUrlWnd->m_bHilighted ){ - // ƒnƒCƒ‰ƒCƒgŽž”wŒi•`‰æ + // ãƒã‚¤ãƒ©ã‚¤ãƒˆæ™‚背景æç”» SetBkColor( hdc, RGB( 0xff, 0xff, 0 ) ); ::ExtTextOutW_AnyBuild( hdc, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); }else{ - // e‚ÉWM_CTLCOLORSTATIC‚ð‘—‚Á‚Ä”wŒiƒuƒ‰ƒV‚ðŽæ“¾‚µA”wŒi•`‰æ‚·‚é + // 親ã«WM_CTLCOLORSTATICã‚’é€ã£ã¦èƒŒæ™¯ãƒ–ラシをå–å¾—ã—ã€èƒŒæ™¯æç”»ã™ã‚‹ HBRUSH hbr; HBRUSH hbrOld; hbr = (HBRUSH)SendMessageAny( GetParent( hWnd ), WM_CTLCOLORSTATIC, wParam, (LPARAM)hWnd ); @@ -429,7 +429,7 @@ LRESULT CALLBACK CUrlWnd::UrlWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM } return (LRESULT)1; case WM_DESTROY: - // ŒãŽn–– + // 後始末 KillTimer( hWnd, 1 ); SetWindowLongPtr( hWnd, GWLP_WNDPROC, (LONG_PTR)pUrlWnd->m_pOldProc ); if( pUrlWnd->m_hFont != NULL ) diff --git a/sakura_core/dlg/CDlgAbout.h b/sakura_core/dlg/CDlgAbout.h index 3f054ab615..185b732a5d 100644 --- a/sakura_core/dlg/CDlgAbout.h +++ b/sakura_core/dlg/CDlgAbout.h @@ -1,9 +1,9 @@ -/*! @file - @brief ƒo[ƒWƒ‡ƒ“î•ñƒ_ƒCƒAƒƒO +/*! @file + @brief ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報ダイアログ @author Norio Nakatani - @date 1998/05/22 ì¬ - @date 1999/12/05 Äì¬ + @date 1998/05/22 ä½œæˆ + @date 1999/12/05 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -18,10 +18,10 @@ #include "dlg/CDialog.h" /*! - @brief About BoxŠÇ— + @brief About Boxç®¡ç† - DispatchEvent‚ð“ÆŽ©‚É’è‹`‚·‚邱‚Æ‚ÅCCDialog‚ŃTƒ|[ƒg‚³‚ê‚Ä‚¢‚È‚¢ - ƒƒbƒZ[ƒW‚ð•ß‘¨‚·‚éD + DispatchEventを独自ã«å®šç¾©ã™ã‚‹ã“ã¨ã§ï¼ŒCDialogã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ + メッセージをæ•æ‰ã™ã‚‹ï¼Ž */ class CUrlWnd @@ -43,8 +43,8 @@ class CUrlWnd class CDlgAbout : public CDialog { public: - int DoModal( HINSTANCE, HWND ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - // Nov. 7, 2000 genta •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + int DoModal( HINSTANCE, HWND ); /* モーダルダイアログã®è¡¨ç¤º */ + // Nov. 7, 2000 genta 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); protected: BOOL OnInitDialog( HWND, WPARAM, LPARAM ); diff --git a/sakura_core/dlg/CDlgCancel.cpp b/sakura_core/dlg/CDlgCancel.cpp index 20057b9139..6e5319f23a 100644 --- a/sakura_core/dlg/CDlgCancel.cpp +++ b/sakura_core/dlg/CDlgCancel.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief キャンセルボタンダイアログボックス @author Norio Nakatani */ @@ -15,12 +15,12 @@ CDlgCancel::CDlgCancel() { - m_bCANCEL = FALSE; /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ */ + m_bCANCEL = FALSE; /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸ */ m_bAutoCleanup = false; } -/** •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é - @date 2008.05.28 ryoji V‹Kì¬ +/** 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ + @date 2008.05.28 ryoji æ–°è¦ä½œæˆ */ INT_PTR CDlgCancel::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { @@ -43,8 +43,8 @@ INT_PTR CDlgCancel::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM l return result; } -/** Ž©“®”jŠü‚ð’x‰„ŽÀs‚·‚é - @date 2008.05.28 ryoji V‹Kì¬ +/** 自動破棄をé…延実行ã™ã‚‹ + @date 2008.05.28 ryoji æ–°è¦ä½œæˆ */ void CDlgCancel::DeleteAsync( void ) { @@ -52,16 +52,16 @@ void CDlgCancel::DeleteAsync( void ) ::PostMessageAny( GetHwnd(), WM_CLOSE, 0, 0 ); } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgCancel::DoModal( HINSTANCE hInstance, HWND hwndParent, int nDlgTemplete ) { - m_bCANCEL = FALSE; /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ */ + m_bCANCEL = FALSE; /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸ */ return (int)CDialog::DoModal( hInstance, hwndParent, nDlgTemplete, (LPARAM)NULL ); } -/* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モードレスダイアログã®è¡¨ç¤º */ HWND CDlgCancel::DoModeless( HINSTANCE hInstance, HWND hwndParent, int nDlgTemplete ) { - m_bCANCEL = FALSE; /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ */ + m_bCANCEL = FALSE; /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸ */ return CDialog::DoModeless( hInstance, hwndParent, nDlgTemplete, (LPARAM)NULL, SW_SHOW ); } @@ -78,7 +78,7 @@ BOOL CDlgCancel::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) ::SendMessageAny( GetHwnd(), WM_SETICON, ICON_BIG, (LPARAM)hIcon ); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ // CreateSizeBox(); return CDialog::OnInitDialog( hwndDlg, wParam, lParam ); } @@ -87,7 +87,7 @@ BOOL CDlgCancel::OnBnClicked( int wID ) { switch( wID ){ case IDCANCEL: - m_bCANCEL = TRUE; /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ */ + m_bCANCEL = TRUE; /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸ */ // CloseDialog( 0 ); return TRUE; } diff --git a/sakura_core/dlg/CDlgCancel.h b/sakura_core/dlg/CDlgCancel.h index 3b039bbc50..d044cbfa74 100644 --- a/sakura_core/dlg/CDlgCancel.h +++ b/sakura_core/dlg/CDlgCancel.h @@ -1,9 +1,9 @@ -/*! @file - @brief ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“ƒ_ƒCƒAƒƒO +/*! @file + @brief キャンセルボタンダイアログ @author Norio Nakatani - @date 1998/09/09 ì¬ - @date 1999/12/02 Äì¬ + @date 1998/09/09 ä½œæˆ + @date 1999/12/02 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -22,7 +22,7 @@ class CDlgCancel; /*! - @brief ƒLƒƒƒ“ƒZƒ‹ƒ{ƒ^ƒ“ƒ_ƒCƒAƒƒO + @brief キャンセルボタンダイアログ */ class CDlgCancel : public CDialog { @@ -31,29 +31,29 @@ class CDlgCancel : public CDialog || Constructors */ CDlgCancel(); -// void Create( HINSTANCE, HWND ); /* ‰Šú‰» */ +// void Create( HINSTANCE, HWND ); /* åˆæœŸåŒ– */ /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, int ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - HWND DoModeless( HINSTANCE, HWND, int ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, int ); /* モードレスダイアログã®è¡¨ç¤º */ + HWND DoModeless( HINSTANCE, HWND, int ); /* モードレスダイアログã®è¡¨ç¤º */ // HWND Open( LPCTSTR ); -// void Close( void ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ìíœ */ - BOOL IsCanceled( void ){ return m_bCANCEL; } /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ‚©H */ - INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ƒ_ƒCƒAƒƒO‚̃ƒbƒZ[ƒWˆ— *//* BOOL->INT_PTR 2008/7/18 Uchi*/ - void DeleteAsync( void ); /* Ž©“®”jŠü‚ð’x‰„ŽÀs‚·‚é */ // 2008.05.28 ryoji +// void Close( void ); /* モードレスダイアログã®å‰Šé™¤ */ + BOOL IsCanceled( void ){ return m_bCANCEL; } /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸã‹ï¼Ÿ */ + INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ダイアログã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç† *//* BOOL->INT_PTR 2008/7/18 Uchi*/ + void DeleteAsync( void ); /* 自動破棄をé…延実行ã™ã‚‹ */ // 2008.05.28 ryoji -// HINSTANCE m_hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ -// HWND m_hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ -// HWND m_hWnd; /* ‚±‚̃_ƒCƒAƒƒO‚̃nƒ“ƒhƒ‹ */ - BOOL m_bCANCEL; /* IDCANCELƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ */ - bool m_bAutoCleanup; /* Ž©“®Œãˆ—Œ^ */ // 2008.05.28 ryoji +// HINSTANCE m_hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ +// HWND m_hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ +// HWND m_hWnd; /* ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®ãƒãƒ³ãƒ‰ãƒ« */ + BOOL m_bCANCEL; /* IDCANCELボタンãŒæŠ¼ã•ã‚ŒãŸ */ + bool m_bAutoCleanup; /* 自動後処ç†åž‹ */ // 2008.05.28 ryoji protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnBnClicked( int ); diff --git a/sakura_core/dlg/CDlgCompare.cpp b/sakura_core/dlg/CDlgCompare.cpp index 456bea6410..26e2120c3b 100644 --- a/sakura_core/dlg/CDlgCompare.cpp +++ b/sakura_core/dlg/CDlgCompare.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹”äŠrƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief ファイル比較ダイアログボックス @author Norio Nakatani */ @@ -26,15 +26,15 @@ #include "sakura_rc.h" #include "sakura.hh" -// ƒtƒ@ƒCƒ‹“à—e”äŠr CDlgCompare.cpp //@@@ 2002.01.07 add start MIK +// ファイル内容比較 CDlgCompare.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12300 // IDC_STATIC, -1, IDOK, HIDOK_CMP, //OK - IDCANCEL, HIDCANCEL_CMP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_CMP_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHECK_TILE_H, HIDC_CMP_CHECK_TILE_H, //¶‰E‚É•\Ž¦ - IDC_LIST_FILES, HIDC_CMP_LIST_FILES, //ƒtƒ@ƒCƒ‹ˆê—— - IDC_STATIC_COMPARESRC, HIDC_CMP_STATIC_COMPARESRC, //ƒ\[ƒXƒtƒ@ƒCƒ‹ + IDCANCEL, HIDCANCEL_CMP, //キャンセル + IDC_BUTTON_HELP, HIDC_CMP_BUTTON_HELP, //ヘルプ + IDC_CHECK_TILE_H, HIDC_CMP_CHECK_TILE_H, //å·¦å³ã«è¡¨ç¤º + IDC_LIST_FILES, HIDC_CMP_LIST_FILES, //ファイル一覧 + IDC_STATIC_COMPARESRC, HIDC_CMP_STATIC_COMPARESRC, //ソースファイル 0, 0 }; //@@@ 2002.01.07 add end MIK @@ -50,10 +50,10 @@ static const SAnchorList anchorList[] = { CDlgCompare::CDlgCompare() : CDialog(true) { - /* ƒTƒCƒY•ÏXŽž‚Ɉʒu‚ð§Œä‚·‚éƒRƒ“ƒgƒ[ƒ‹” */ + /* サイズ変更時ã«ä½ç½®ã‚’制御ã™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«æ•° */ assert( _countof(anchorList) == _countof(m_rcItems) ); - m_bCompareAndTileHorz = TRUE; /* ¶‰E‚É•À‚ׂĕ\Ž¦ */ + m_bCompareAndTileHorz = TRUE; /* å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º */ m_ptDefaultSize.x = -1; m_ptDefaultSize.y = -1; @@ -61,7 +61,7 @@ CDlgCompare::CDlgCompare() } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgCompare::DoModal( HINSTANCE hInstance, HWND hwndParent, @@ -81,19 +81,19 @@ BOOL CDlgCompare::OnBnClicked( int wID ) { switch( wID ){ case IDC_BUTTON_HELP: - /* u“à—e”äŠrv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_COMPARE) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「内容比較ã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_COMPARE) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; -// From Here Oct. 10, 2000 JEPRO added Ref. code ‚ÍCDlgFind.cpp ‚Ì OnBnClicked -// ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðƒ{ƒ^ƒ“‰»‚µ‚ÄCDlgCompare.cpp‚É’¼Ú‘‚«ž‚ñ‚Å‚Ý‚½‚ªŽ¸”s -// ƒ_ƒCƒAƒƒO‚̃{ƒ^ƒ“‚͉º‚É•s‰ÂŽ‹‰»‚µ‚Ä‚¨‚¢‚Ä‚ ‚è‚Ü‚·B -// ˆÈ‰º‚̒ljÁƒR[ƒh‚Í‘S•”Á‚µ‚ÄŒ‹\‚Å‚·‚©‚ç’N‚©ì‚Á‚Ä‚­‚¾‚³‚¢B…•½ƒXƒNƒ[ƒ‹‚à“ü‚ê‚Ä‚­‚ê‚é‚Æ‚È‚¨‚¤‚ꂵ‚¢‚Å‚·B -// case IDC_BUTTON1: /* ㉺‚É•\Ž¦ */ -// /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +// From Here Oct. 10, 2000 JEPRO added Ref. code ã¯CDlgFind.cpp ã® OnBnClicked +// ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’ボタン化ã—ã¦CDlgCompare.cppã«ç›´æŽ¥æ›¸ã込んã§ã¿ãŸãŒå¤±æ•— +// ダイアログã®ãƒœã‚¿ãƒ³ã¯ä¸‹ã«ä¸å¯è¦–化ã—ã¦ãŠã„ã¦ã‚ã‚Šã¾ã™ã€‚ +// 以下ã®è¿½åŠ ã‚³ãƒ¼ãƒ‰ã¯å…¨éƒ¨æ¶ˆã—ã¦çµæ§‹ã§ã™ã‹ã‚‰èª°ã‹ä½œã£ã¦ãã ã•ã„。水平スクロールも入れã¦ãれるã¨ãªãŠã†ã‚Œã—ã„ã§ã™ã€‚ +// case IDC_BUTTON1: /* 上下ã«è¡¨ç¤º */ +// /* ダイアログデータã®å–å¾— */ // return TRUE; -// case IDOK: /* ¶‰E‚É•\Ž¦ */ -// /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +// case IDOK: /* å·¦å³ã«è¡¨ç¤º */ +// /* ダイアログデータã®å–å¾— */ // HWND hwndCompareWnd; // HWND* phwndArr; // int i; @@ -110,20 +110,20 @@ BOOL CDlgCompare::OnBnClicked( int wID ) // CloseDialog( 0 ); // return TRUE; // To Here Oct. 10, 2000 - case IDOK: /* ¶‰E‚É•\Ž¦ */ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDOK: /* å·¦å³ã«è¡¨ç¤º */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), GetData() ); return TRUE; case IDCANCEL: ::EndDialog( GetHwnd(), FALSE ); return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgCompare::SetData( void ) { HWND hwndList; @@ -137,58 +137,58 @@ void CDlgCompare::SetData( void ) hwndList = :: GetDlgItem( GetHwnd(), IDC_LIST_FILES ); -// 2002/2/10 aroka ƒtƒ@ƒCƒ‹–¼‚Å”äŠr‚µ‚È‚¢‚½‚ß•s—p (2001.12.26 YAZAKI‚³‚ñ) -// // Oct. 15, 2001 genta ƒtƒ@ƒCƒ‹–¼”»’è‚Ì stricmp‚ðbcc‚Å‚àŠú‘Ò’Ê‚è“®‚©‚·‚½‚ß +// 2002/2/10 aroka ファイルåã§æ¯”較ã—ãªã„ãŸã‚ä¸ç”¨ (2001.12.26 YAZAKIã•ã‚“) +// // Oct. 15, 2001 genta ファイルå判定㮠stricmpã‚’bccã§ã‚‚期待通り動ã‹ã™ãŸã‚ // setlocale ( LC_ALL, "C" ); - /* Œ»ÝŠJ‚¢‚Ä‚¢‚é•ÒW‘‹‚̃ŠƒXƒg‚ðƒƒjƒ…[‚É‚·‚é */ + /* ç¾åœ¨é–‹ã„ã¦ã„る編集窓ã®ãƒªã‚¹ãƒˆã‚’メニューã«ã™ã‚‹ */ nRowNum = CAppNodeManager::getInstance()->GetOpenedWindowArr( &pEditNodeArr, TRUE ); if( nRowNum > 0 ){ - // …•½ƒXƒNƒ[ƒ‹•‚ÍŽÀÛ‚É•\Ž¦‚·‚镶Žš—ñ‚Ì•‚ðŒv‘ª‚µ‚ÄŒˆ‚ß‚é // 2009.09.26 ryoji + // 水平スクロール幅ã¯å®Ÿéš›ã«è¡¨ç¤ºã™ã‚‹æ–‡å­—列ã®å¹…を計測ã—ã¦æ±ºã‚ã‚‹ // 2009.09.26 ryoji CTextWidthCalc calc(hwndList); int score = 0; TCHAR szFile1[_MAX_PATH]; SplitPath_FolderAndFile(m_pszPath, NULL, szFile1); for( i = 0; i < nRowNum; ++i ){ - /* ƒgƒŒƒC‚©‚çƒGƒfƒBƒ^‚Ö‚Ì•ÒWƒtƒ@ƒCƒ‹–¼—v‹’Ê’m */ + /* トレイã‹ã‚‰ã‚¨ãƒ‡ã‚£ã‚¿ã¸ã®ç·¨é›†ãƒ•ã‚¡ã‚¤ãƒ«åè¦æ±‚通知 */ ::SendMessageAny( pEditNodeArr[i].GetHwnd(), MYWM_GETFILEINFO, 0, 0 ); pfi = (EditInfo*)&m_pShareData->m_sWorkBuffer.m_EditInfo_MYWM_GETFILEINFO; -//@@@ 2001.12.26 YAZAKI ƒtƒ@ƒCƒ‹–¼‚Å”äŠr‚·‚é‚Æ(–³‘è)‚¾‚Á‚½‚Æ‚«‚É–â‘蓯Žm‚Ì”äŠr‚ª‚Å‚«‚È‚¢ +//@@@ 2001.12.26 YAZAKI ファイルåã§æ¯”較ã™ã‚‹ã¨(ç„¡é¡Œ)ã ã£ãŸã¨ãã«å•é¡ŒåŒå£«ã®æ¯”較ãŒã§ããªã„ if (pEditNodeArr[i].GetHwnd() == CEditWnd::getInstance()->GetHwnd()){ - // 2010.07.30 Ž©•ª‚Ì–¼‘O‚à‚±‚±‚©‚çÝ’è‚·‚é + // 2010.07.30 自分ã®åå‰ã‚‚ã“ã“ã‹ã‚‰è¨­å®šã™ã‚‹ CFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( szMenu, _countof(szMenu), pfi, pEditNodeArr[i].m_nId, -1, calc.GetDC() ); ::DlgItem_SetText( GetHwnd(), IDC_STATIC_COMPARESRC, szMenu ); continue; } - // ”Ô†‚Í ƒEƒBƒ“ƒhƒEƒŠƒXƒg‚Æ“¯‚¶‚É‚È‚é‚悤‚É‚·‚é + // 番å·ã¯ ウィンドウリストã¨åŒã˜ã«ãªã‚‹ã‚ˆã†ã«ã™ã‚‹ CFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( szMenu, _countof(szMenu), pfi, pEditNodeArr[i].m_nId, i, calc.GetDC() ); nItem = ::List_AddString( hwndList, szMenu ); List_SetItemData( hwndList, nItem, pEditNodeArr[i].GetHwnd() ); - // ‰¡•‚ðŒvŽZ‚·‚é + // 横幅を計算ã™ã‚‹ calc.SetTextWidthIfMax(szMenu); - // ƒtƒ@ƒCƒ‹–¼ˆê’v‚̃XƒRƒA‚ðŒvŽZ‚·‚é + // ファイルå一致ã®ã‚¹ã‚³ã‚¢ã‚’計算ã™ã‚‹ TCHAR szFile2[_MAX_PATH]; SplitPath_FolderAndFile( pfi->m_szPath, NULL, szFile2 ); int scoreTemp = FileMatchScoreSepExt( szFile1, szFile2 ); if( score < scoreTemp ){ - // ƒXƒRƒA‚Ì‚¢‚¢‚à‚Ì‚ð‘I‘ð + // スコアã®ã„ã„ã‚‚ã®ã‚’é¸æŠž score = scoreTemp; selIndex = nItem; } } delete [] pEditNodeArr; - // 2002/11/01 Moca ’ljÁ ƒŠƒXƒgƒrƒ…[‚̉¡•‚ðÝ’èB‚±‚ê‚ð‚â‚ç‚È‚¢‚Æ…•½ƒXƒNƒ[ƒ‹ƒo[‚ªŽg‚¦‚È‚¢ + // 2002/11/01 Moca 追加 リストビューã®æ¨ªå¹…を設定。ã“れをやらãªã„ã¨æ°´å¹³ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ãŒä½¿ãˆãªã„ List_SetHorizontalExtent( hwndList, calc.GetCx() ); } List_SetCurSel( hwndList, selIndex ); - /* ¶‰E‚É•À‚ׂĕ\Ž¦ */ + /* å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º */ //@@@ 2003.06.12 MIK - // TAB 1ƒEƒBƒ“ƒhƒE•\Ž¦‚Ì‚Æ‚«‚Í•À‚ׂĔäŠr‚Å‚«‚È‚­‚·‚é + // TAB 1ウィンドウ表示ã®ã¨ãã¯ä¸¦ã¹ã¦æ¯”較ã§ããªãã™ã‚‹ if( FALSE != m_pShareData->m_Common.m_sTabBar.m_bDispTabWnd && !m_pShareData->m_Common.m_sTabBar.m_bDispTabWndMultiWin ) { @@ -202,8 +202,8 @@ void CDlgCompare::SetData( void ) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgCompare::GetData( void ) { HWND hwndList; @@ -215,16 +215,16 @@ int CDlgCompare::GetData( void ) return FALSE; }else{ *m_phwndCompareWnd = (HWND)List_GetItemData( hwndList, nItem ); - /* ƒgƒŒƒC‚©‚çƒGƒfƒBƒ^‚Ö‚Ì•ÒWƒtƒ@ƒCƒ‹–¼—v‹’Ê’m */ + /* トレイã‹ã‚‰ã‚¨ãƒ‡ã‚£ã‚¿ã¸ã®ç·¨é›†ãƒ•ã‚¡ã‚¤ãƒ«åè¦æ±‚通知 */ ::SendMessageAny( *m_phwndCompareWnd, MYWM_GETFILEINFO, 0, 0 ); pfi = (EditInfo*)&m_pShareData->m_sWorkBuffer.m_EditInfo_MYWM_GETFILEINFO; - // 2010.07.30 ƒpƒX–¼‚Í‚â‚ß‚Ä•\Ž¦–¼‚É•ÏX + // 2010.07.30 パスåã¯ã‚„ã‚ã¦è¡¨ç¤ºåã«å¤‰æ›´ int nId = CAppNodeManager::getInstance()->GetEditNode( *m_phwndCompareWnd )->GetId(); CTextWidthCalc calc(hwndList); - CFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( m_pszCompareLabel, _MAX_PATH/*’·‚³•s–¾*/, pfi, nId, -1, calc.GetDC() ); + CFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( m_pszCompareLabel, _MAX_PATH/*é•·ã•ä¸æ˜Ž*/, pfi, nId, -1, calc.GetDC() ); - /* ¶‰E‚É•À‚ׂĕ\Ž¦ */ + /* å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º */ m_bCompareAndTileHorz = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_TILE_H ); return TRUE; @@ -279,7 +279,7 @@ BOOL CDlgCompare::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) BOOL CDlgCompare::OnSize( WPARAM wParam, LPARAM lParam ) { - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ CDialog::OnSize( wParam, lParam ); ::GetWindowRect( GetHwnd(), &GetDllShareData().m_Common.m_sOthers.m_rcCompareDialog ); diff --git a/sakura_core/dlg/CDlgCompare.h b/sakura_core/dlg/CDlgCompare.h index e50870eb9a..2883a2ce13 100644 --- a/sakura_core/dlg/CDlgCompare.h +++ b/sakura_core/dlg/CDlgCompare.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹”äŠrƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief ファイル比較ダイアログボックス @author Norio Nakatani */ @@ -18,7 +18,7 @@ class CDlgCompare; #include "dlg/CDialog.h" /*! - @brief ƒtƒ@ƒCƒ‹”äŠrƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief ファイル比較ダイアログボックス */ class CDlgCompare : public CDialog { @@ -31,28 +31,28 @@ class CDlgCompare : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR*, TCHAR*, HWND* ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR*, TCHAR*, HWND* ); /* モーダルダイアログã®è¡¨ç¤º */ const TCHAR* m_pszPath; TCHAR* m_pszCompareLabel; HWND* m_phwndCompareWnd; - BOOL m_bCompareAndTileHorz;/* ¶‰E‚É•À‚ׂĕ\Ž¦ */ + BOOL m_bCompareAndTileHorz;/* å·¦å³ã«ä¸¦ã¹ã¦è¡¨ç¤º */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnSize( WPARAM wParam, LPARAM lParam ); BOOL OnMove( WPARAM wParam, LPARAM lParam ); BOOL OnMinMaxInfo( LPARAM lParam ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ private: POINT m_ptDefaultSize; diff --git a/sakura_core/dlg/CDlgCtrlCode.h b/sakura_core/dlg/CDlgCtrlCode.h index b379c6a74e..97bedabc7f 100644 --- a/sakura_core/dlg/CDlgCtrlCode.h +++ b/sakura_core/dlg/CDlgCtrlCode.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒRƒ“ƒgƒ[ƒ‹ƒR[ƒh“ü—̓_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief コントロールコード入力ダイアログボックス @author MIK @date 2002.6.2 @@ -35,9 +35,9 @@ class CDlgCtrlCode; #include "dlg/CDialog.h" /*! - @brief ƒRƒ“ƒgƒ[ƒ‹ƒR[ƒh“ü—̓_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief コントロールコード入力ダイアログボックス */ -//2007.10.18 kobake GetCharCode()‚ðì¬B +//2007.10.18 kobake GetCharCode()を作æˆã€‚ class CDlgCtrlCode : public CDialog { public: @@ -49,27 +49,27 @@ class CDlgCtrlCode : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ - wchar_t GetCharCode() const{ return m_nCode; } //!< ‘I‘ð‚³‚ê‚½•¶ŽšƒR[ƒh‚ðŽæ“¾ + wchar_t GetCharCode() const{ return m_nCode; } //!< é¸æŠžã•ã‚ŒãŸæ–‡å­—コードをå–å¾— private: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ); BOOL OnBnClicked( int ); BOOL OnNotify( WPARAM wParam, LPARAM lParam ); LPVOID GetHelpIdTable( void ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ private: /* - || ƒƒ“ƒo•Ï” + || メンãƒå¤‰æ•° */ - wchar_t m_nCode; // ƒR[ƒh + wchar_t m_nCode; // コード }; diff --git a/sakura_core/dlg/CDlgDiff.cpp b/sakura_core/dlg/CDlgDiff.cpp index 8801ce3820..cac16e929d 100644 --- a/sakura_core/dlg/CDlgDiff.cpp +++ b/sakura_core/dlg/CDlgDiff.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief DIFF·•ª•\Ž¦ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief DIFF差分表示ダイアログボックス @author MIK @date 2002.5.27 @@ -9,7 +9,7 @@ Copyright (C) 2001, Stonee, genta, JEPRO, YAZAKI Copyright (C) 2002, aroka, MIK, Moca Copyright (C) 2003, MIK, genta - Copyright (C) 2004, MIK, genta, ‚¶‚イ‚¶ + Copyright (C) 2004, MIK, genta, ã˜ã‚…ã†ã˜ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji @@ -47,9 +47,9 @@ const DWORD p_helpids[] = { //13200 IDOK, HIDC_DIFF_IDOK, IDCANCEL, HIDC_DIFF_IDCANCEL, IDC_BUTTON_HELP, HIDC_BUTTON_DIFF_HELP, - IDC_CHECK_DIFF_EXEC_STATE, HIDC_CHECK_DIFF_EXEC_STATE, //DIFF·•ª‚ªŒ©‚‚©‚ç‚È‚¢‚Æ‚«‚ɃƒbƒZ[ƒW‚ð•\Ž¦ 2003.05.12 MIK - IDC_CHECK_NOTIFYNOTFOUND, HIDC_CHECK_DIFF_NOTIFYNOTFOUND, // Œ©‚‚©‚ç‚È‚¢‚Æ‚«‚ɃƒbƒZ[ƒW‚ð•\Ž¦ // 2006.10.10 ryoji - IDC_CHECK_SEARCHALL, HIDC_CHECK_DIFF_SEARCHALL, // 擪i––”öj‚©‚çÄŒŸõ‚·‚é // 2006.10.10 ryoji + IDC_CHECK_DIFF_EXEC_STATE, HIDC_CHECK_DIFF_EXEC_STATE, //DIFF差分ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã¨ãã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示 2003.05.12 MIK + IDC_CHECK_NOTIFYNOTFOUND, HIDC_CHECK_DIFF_NOTIFYNOTFOUND, // 見ã¤ã‹ã‚‰ãªã„ã¨ãã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示 // 2006.10.10 ryoji + IDC_CHECK_SEARCHALL, HIDC_CHECK_DIFF_SEARCHALL, // 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ã™ã‚‹ // 2006.10.10 ryoji // IDC_FRAME_SEARCH_MSG, HIDC_FRAME_DIFF_SEARCH_MSG, // IDC_STATIC, -1, 0, 0 @@ -85,7 +85,7 @@ CDlgDiff::CDlgDiff() : CDialog(true) , m_nIndexSave( 0 ) { - /* ƒTƒCƒY•ÏXŽž‚Ɉʒu‚ð§Œä‚·‚éƒRƒ“ƒgƒ[ƒ‹” */ + /* サイズ変更時ã«ä½ç½®ã‚’制御ã™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«æ•° */ assert( _countof(anchorList) == _countof(m_rcItems) ); m_nDiffFlgOpt = 0; @@ -98,12 +98,12 @@ CDlgDiff::CDlgDiff() return; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgDiff::DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam, - const TCHAR* pszPath //Ž©ƒtƒ@ƒCƒ‹ + const TCHAR* pszPath //自ファイル ) { _tcscpy(m_szFile1, pszPath); @@ -116,16 +116,16 @@ BOOL CDlgDiff::OnBnClicked( int wID ) switch( wID ) { case IDC_BUTTON_HELP: - /* ƒwƒ‹ƒv */ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_DIFF_DIALOG) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* ヘルプ */ + MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_DIFF_DIALOG) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDC_BUTTON_DIFF_DST: /* ŽQÆ */ + case IDC_BUTTON_DIFF_DST: /* å‚ç…§ */ { CDlgOpenFile cDlgOpenFile; TCHAR szPath[_MAX_PATH]; _tcscpy( szPath, m_szFile2 ); - /* ƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒ_ƒCƒAƒƒO‚̉Šú‰» */ + /* ファイルオープンダイアログã®åˆæœŸåŒ– */ cDlgOpenFile.Create( m_hInstance, GetHwnd(), @@ -136,7 +136,7 @@ BOOL CDlgDiff::OnBnClicked( int wID ) { _tcscpy( m_szFile2, szPath ); ::DlgItem_SetText( GetHwnd(), IDC_EDIT_DIFF_DST, m_szFile2 ); - //ŠO•”ƒtƒ@ƒCƒ‹‚ð‘I‘ðó‘Ô‚É + //外部ファイルをé¸æŠžçŠ¶æ…‹ã« ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST1, TRUE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST2, FALSE ); List_SetCurSel( ::GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES), -1 ); @@ -144,8 +144,8 @@ BOOL CDlgDiff::OnBnClicked( int wID ) } return TRUE; - case IDOK: /* ¶‰E‚É•\Ž¦ */ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDOK: /* å·¦å³ã«è¡¨ç¤º */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), GetData() ); return TRUE; @@ -158,7 +158,7 @@ BOOL CDlgDiff::OnBnClicked( int wID ) //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_EDIT_DIFF_DST ), TRUE ); //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_DIFF_DST ), TRUE ); //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ), FALSE ); - // Feb. 28, 2004 genta ‘I‘ð‰ðœ‘O‚É‘O‰ñ‚̈ʒu‚ð‹L‰¯ + // Feb. 28, 2004 genta é¸æŠžè§£é™¤å‰ã«å‰å›žã®ä½ç½®ã‚’記憶 { int n = List_GetCurSel( GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ) ); if( n != LB_ERR ){ @@ -175,7 +175,7 @@ BOOL CDlgDiff::OnBnClicked( int wID ) //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ), TRUE ); { // Aug. 9, 2003 genta - // ListBox‚ª‘I‘ð‚³‚ê‚Ä‚¢‚È‚©‚Á‚½‚çC擪‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚·‚éD + // ListBoxãŒé¸æŠžã•ã‚Œã¦ã„ãªã‹ã£ãŸã‚‰ï¼Œå…ˆé ­ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã™ã‚‹ï¼Ž HWND hwndList = GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ); if( List_GetCurSel( hwndList ) == LB_ERR ) { @@ -193,14 +193,14 @@ BOOL CDlgDiff::OnBnClicked( int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgDiff::SetData( void ) { - //ƒIƒvƒVƒ‡ƒ“ + //オプション m_nDiffFlgOpt = m_pShareData->m_nDiffFlgOpt; if( m_nDiffFlgOpt & 0x0001 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_DIFF_OPT_CASE, TRUE ); if( m_nDiffFlgOpt & 0x0002 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_DIFF_OPT_SPACE, TRUE ); @@ -208,7 +208,7 @@ void CDlgDiff::SetData( void ) if( m_nDiffFlgOpt & 0x0008 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_DIFF_OPT_BLINE, TRUE ); if( m_nDiffFlgOpt & 0x0010 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_DIFF_OPT_TABSPC, TRUE ); - //V‹Œƒtƒ@ƒCƒ‹ + //新旧ファイル if( m_nDiffFlgOpt & 0x0020 ) { ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_FILE1, FALSE ); @@ -223,16 +223,16 @@ void CDlgDiff::SetData( void ) //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_DIFF_FILE1 ), FALSE ); //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_DIFF_FILE2 ), FALSE ); - //DIFF·•ª‚ªŒ©‚‚©‚ç‚È‚¢‚Æ‚«‚ɃƒbƒZ[ƒW‚ð•\Ž¦ 2003.05.12 MIK + //DIFF差分ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã¨ãã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示 2003.05.12 MIK if( m_nDiffFlgOpt & 0x0040 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_DIFF_EXEC_STATE, TRUE ); - /* Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND, m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND ); - /* 擪i––”öj‚©‚çÄŒŸõ */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_SEARCHALL, m_pShareData->m_Common.m_sSearch.m_bSearchAll ); - /* •ÒW’†‚̃tƒ@ƒCƒ‹ˆê——‚ð쬂·‚é */ + /* 編集中ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’作æˆã™ã‚‹ */ { HWND hwndList; int nRowNum; @@ -246,57 +246,57 @@ void CDlgDiff::SetData( void ) ECodeType code; int selCode = CODE_NONE; - // Ž©•ª‚Ì•¶ŽšƒR[ƒh‚ðŽæ“¾ + // 自分ã®æ–‡å­—コードをå–å¾— ::SendMessageAny( CEditWnd::getInstance()->GetHwnd(), MYWM_GETFILEINFO, 0, 0 ); pFileInfo = &m_pShareData->m_sWorkBuffer.m_EditInfo_MYWM_GETFILEINFO; code = pFileInfo->m_nCharCode; - /* ƒŠƒXƒg‚̃nƒ“ƒhƒ‹Žæ“¾ */ + /* リストã®ãƒãƒ³ãƒ‰ãƒ«å–å¾— */ hwndList = :: GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ); - /* Œ»ÝŠJ‚¢‚Ä‚¢‚é•ÒW‘‹‚̃ŠƒXƒg‚ðƒƒjƒ…[‚É‚·‚é */ + /* ç¾åœ¨é–‹ã„ã¦ã„る編集窓ã®ãƒªã‚¹ãƒˆã‚’メニューã«ã™ã‚‹ */ nRowNum = CAppNodeManager::getInstance()->GetOpenedWindowArr( &pEditNode, TRUE ); if( nRowNum > 0 ) { - // …•½ƒXƒNƒ[ƒ‹•‚ÍŽÀÛ‚É•\Ž¦‚·‚镶Žš—ñ‚Ì•‚ðŒv‘ª‚µ‚ÄŒˆ‚ß‚é // 2009.09.26 ryoji + // 水平スクロール幅ã¯å®Ÿéš›ã«è¡¨ç¤ºã™ã‚‹æ–‡å­—列ã®å¹…を計測ã—ã¦æ±ºã‚ã‚‹ // 2009.09.26 ryoji CTextWidthCalc calc(hwndList); int score = 0; TCHAR szFile1[_MAX_PATH]; SplitPath_FolderAndFile(m_szFile1, NULL, szFile1); for( i = 0; i < nRowNum; i++ ) { - /* ƒgƒŒƒC‚©‚çƒGƒfƒBƒ^‚Ö‚Ì•ÒWƒtƒ@ƒCƒ‹–¼—v‹’Ê’m */ + /* トレイã‹ã‚‰ã‚¨ãƒ‡ã‚£ã‚¿ã¸ã®ç·¨é›†ãƒ•ã‚¡ã‚¤ãƒ«åè¦æ±‚通知 */ ::SendMessageAny( pEditNode[i].GetHwnd(), MYWM_GETFILEINFO, 0, 0 ); pFileInfo = (EditInfo*)&m_pShareData->m_sWorkBuffer.m_EditInfo_MYWM_GETFILEINFO; - /* Ž©•ª‚È‚çƒXƒLƒbƒv */ + /* 自分ãªã‚‰ã‚¹ã‚­ãƒƒãƒ— */ if ( pEditNode[i].GetHwnd() == CEditWnd::getInstance()->GetHwnd() ) { - // “¯‚¶Œ`Ž®‚É‚µ‚Ä‚¨‚­B‚½‚¾‚µƒAƒNƒZƒXƒL[”Ô†‚Í‚È‚µ + // åŒã˜å½¢å¼ã«ã—ã¦ãŠã。ãŸã ã—アクセスキー番å·ã¯ãªã— CFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( szName, _countof(szName), pFileInfo, pEditNode[i].m_nId, -1, calc.GetDC() ); ::DlgItem_SetText( GetHwnd(), IDC_STATIC_DIFF_SRC, szName ); continue; } - // ”Ô†‚̓EƒBƒ“ƒhƒEˆê——‚Æ“¯‚¶”Ô†‚ðŽg‚¤ + // 番å·ã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä¸€è¦§ã¨åŒã˜ç•ªå·ã‚’使ㆠCFileNameManager::getInstance()->GetMenuFullLabel_WinListNoEscape( szName, _countof(szName), pFileInfo, pEditNode[i].m_nId, i, calc.GetDC() ); - /* ƒŠƒXƒg‚É“o˜^‚·‚é */ + /* リストã«ç™»éŒ²ã™ã‚‹ */ nItem = ::List_AddString( hwndList, szName ); List_SetItemData( hwndList, nItem, pEditNode[i].GetHwnd() ); count++; - // ‰¡•‚ðŒvŽZ‚·‚é + // 横幅を計算ã™ã‚‹ calc.SetTextWidthIfMax(szName); - // ƒtƒ@ƒCƒ‹–¼ˆê’v‚̃XƒRƒA‚ðŒvŽZ‚·‚é + // ファイルå一致ã®ã‚¹ã‚³ã‚¢ã‚’計算ã™ã‚‹ TCHAR szFile2[_MAX_PATH]; SplitPath_FolderAndFile( pFileInfo->m_szPath, NULL, szFile2 ); int scoreTemp = FileMatchScoreSepExt( szFile1, szFile2 ); if( score < scoreTemp || (selCode != code && code == pFileInfo->m_nCharCode && score == scoreTemp) ){ - // ƒXƒRƒA‚Ì‚¢‚¢‚à‚Ì‚ð‘I‘ð. “¯‚¶‚Ȃ當ŽšƒR[ƒh‚ª“¯‚¶‚à‚Ì‚ð‘I‘ð + // スコアã®ã„ã„ã‚‚ã®ã‚’é¸æŠž. åŒã˜ãªã‚‰æ–‡å­—コードãŒåŒã˜ã‚‚ã®ã‚’é¸æŠž score = scoreTemp; selIndex = nItem; selCode = pFileInfo->m_nCharCode; @@ -304,72 +304,72 @@ void CDlgDiff::SetData( void ) } delete [] pEditNode; - // 2002/11/01 Moca ’ljÁ ƒŠƒXƒgƒrƒ…[‚̉¡•‚ðÝ’èB‚±‚ê‚ð‚â‚ç‚È‚¢‚Æ…•½ƒXƒNƒ[ƒ‹ƒo[‚ªŽg‚¦‚È‚¢ + // 2002/11/01 Moca 追加 リストビューã®æ¨ªå¹…を設定。ã“れをやらãªã„ã¨æ°´å¹³ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ãƒãƒ¼ãŒä½¿ãˆãªã„ List_SetHorizontalExtent( hwndList, calc.GetCx() + 8 ); - /* ʼn‚ð‘I‘ð */ + /* 最åˆã‚’é¸æŠž */ //List_SetCurSel( hwndList, 0 ); } - // From Here 2004.02.22 ‚¶‚イ‚¶ - // ŠJ‚¢‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ª‚ ‚éꇂɂ͉Šúó‘Ô‚Å‚»‚¿‚ç‚ð—Dæ + // From Here 2004.02.22 ã˜ã‚…ã†ã˜ + // é–‹ã„ã¦ã„るファイルãŒã‚ã‚‹å ´åˆã«ã¯åˆæœŸçŠ¶æ…‹ã§ãã¡ã‚‰ã‚’優先 if( count == 0 ) { - /* ‘ŠŽèƒtƒ@ƒCƒ‹‚Ì‘I‘ð */ + /* 相手ファイルã®é¸æŠž */ ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST1, TRUE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST2, FALSE ); - /* ‚»‚Ì‘¼‚Ì•ÒW’†ƒŠƒXƒg‚Í‚È‚µ */ + /* ãã®ä»–ã®ç·¨é›†ä¸­ãƒªã‚¹ãƒˆã¯ãªã— */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_DIFF_DST2 ), FALSE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ), FALSE ); } else { - /* ‘ŠŽèƒtƒ@ƒCƒ‹‚Ì‘I‘ð */ + /* 相手ファイルã®é¸æŠž */ ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST1, FALSE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST2, TRUE ); - // ListBox‚ª‘I‘ð‚³‚ê‚Ä‚¢‚È‚©‚Á‚½‚çC擪‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚·‚éD + // ListBoxãŒé¸æŠžã•ã‚Œã¦ã„ãªã‹ã£ãŸã‚‰ï¼Œå…ˆé ­ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã™ã‚‹ï¼Ž HWND hwndList = GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ); if( List_GetCurSel( hwndList ) == LB_ERR ) { List_SetCurSel( hwndList, selIndex ); } } - // To Here 2004.02.22 ‚¶‚イ‚¶ - // Feb. 28, 2004 genta ˆê”Ôã‚ð‘I‘ðˆÊ’u‚Æ‚·‚éD + // To Here 2004.02.22 ã˜ã‚…ã†ã˜ + // Feb. 28, 2004 genta 一番上をé¸æŠžä½ç½®ã¨ã™ã‚‹ï¼Ž m_nIndexSave = selIndex; } return; } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgDiff::GetData( void ) { BOOL ret = TRUE; - //DIFFƒIƒvƒVƒ‡ƒ“ + //DIFFオプション m_nDiffFlgOpt = 0; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_OPT_CASE ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0001; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_OPT_SPACE ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0002; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_OPT_SPCCHG ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0004; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_OPT_BLINE ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0008; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_OPT_TABSPC ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0010; - //ƒtƒ@ƒCƒ‹V‹Œ + //ファイル新旧 if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_DIFF_FILE2 ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0020; - //DIFF·•ª‚ªŒ©‚‚©‚ç‚È‚¢‚Æ‚«‚ɃƒbƒZ[ƒW‚ð•\Ž¦ 2003.05.12 MIK + //DIFF差分ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã¨ãã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示 2003.05.12 MIK if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_DIFF_EXEC_STATE ) == BST_CHECKED ) m_nDiffFlgOpt |= 0x0040; m_pShareData->m_nDiffFlgOpt = m_nDiffFlgOpt; - //‘ŠŽèƒtƒ@ƒCƒ‹–¼ + //相手ファイルå _tcscpy( m_szFile2, _T("") ); m_hWnd_Dst = NULL; m_bIsModifiedDst = false; if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_DIFF_DST1 ) == BST_CHECKED ) { ::DlgItem_GetText( GetHwnd(), IDC_EDIT_DIFF_DST, m_szFile2, _countof2(m_szFile2) ); - // 2004.05.19 MIK ŠO•”ƒtƒ@ƒCƒ‹‚ªŽw’肳‚ê‚Ä‚¢‚È‚¢ê‡‚̓Lƒƒƒ“ƒZƒ‹ - //‘ŠŽèƒtƒ@ƒCƒ‹‚ªŽw’肳‚ê‚Ä‚È‚¯‚ê‚΃Lƒƒƒ“ƒZƒ‹ + // 2004.05.19 MIK 外部ファイルãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã¯ã‚­ãƒ£ãƒ³ã‚»ãƒ« + //相手ファイルãŒæŒ‡å®šã•ã‚Œã¦ãªã‘ã‚Œã°ã‚­ãƒ£ãƒ³ã‚»ãƒ« if( m_szFile2[0] == '\0' ) ret = FALSE; } @@ -379,14 +379,14 @@ int CDlgDiff::GetData( void ) int nItem; EditInfo *pFileInfo; - /* ƒŠƒXƒg‚©‚ç‘ŠŽè‚̃EƒCƒ“ƒhƒEƒnƒ“ƒhƒ‹‚ðŽæ“¾ */ + /* リストã‹ã‚‰ç›¸æ‰‹ã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ãƒãƒ³ãƒ‰ãƒ«ã‚’å–å¾— */ hwndList = :: GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ); nItem = List_GetCurSel( hwndList ); if( nItem != LB_ERR ) { m_hWnd_Dst = (HWND)List_GetItemData( hwndList, nItem ); - /* ƒgƒŒƒC‚©‚çƒGƒfƒBƒ^‚Ö‚Ì•ÒWƒtƒ@ƒCƒ‹–¼—v‹’Ê’m */ + /* トレイã‹ã‚‰ã‚¨ãƒ‡ã‚£ã‚¿ã¸ã®ç·¨é›†ãƒ•ã‚¡ã‚¤ãƒ«åè¦æ±‚通知 */ ::SendMessageAny( m_hWnd_Dst, MYWM_GETFILEINFO, 0, 0 ); pFileInfo = (EditInfo*)&m_pShareData->m_sWorkBuffer.m_EditInfo_MYWM_GETFILEINFO; @@ -405,20 +405,20 @@ int CDlgDiff::GetData( void ) ret = FALSE; } - /* Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND ) == BST_CHECKED ) m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = TRUE; else m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = FALSE; - /* 擪i––”öj‚©‚çÄŒŸõ */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SEARCHALL ) == BST_CHECKED ) m_pShareData->m_Common.m_sSearch.m_bSearchAll = TRUE; else m_pShareData->m_Common.m_sSearch.m_bSearchAll = FALSE; - //‘ŠŽèƒtƒ@ƒCƒ‹‚ªŽw’肳‚ê‚Ä‚È‚¯‚ê‚΃Lƒƒƒ“ƒZƒ‹ - // 2004.02.21 MIK ‘ŠŽè‚ª–³‘肾‚Æ”äŠr‚Å‚«‚È‚¢‚Ì‚Å”»’èíœ + //相手ファイルãŒæŒ‡å®šã•ã‚Œã¦ãªã‘ã‚Œã°ã‚­ãƒ£ãƒ³ã‚»ãƒ« + // 2004.02.21 MIK 相手ãŒç„¡é¡Œã ã¨æ¯”較ã§ããªã„ã®ã§åˆ¤å®šå‰Šé™¤ //if( m_szFile2[0] == '\0' ) ret = FALSE; return ret; @@ -437,7 +437,7 @@ BOOL CDlgDiff::OnLbnSelChange( HWND hwndCtl, int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnLbnSelChange( hwndCtl, wID ); } @@ -451,7 +451,7 @@ BOOL CDlgDiff::OnEnChange( HWND hwndCtl, int wID ) { ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST1, TRUE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_DIFF_DST2, FALSE ); - // Feb. 28, 2004 genta ‘I‘ð‰ðœ‘O‚É‘O‰ñ‚̈ʒu‚ð‹L‰¯‚µ‚Ä‘I‘ð‰ðœ + // Feb. 28, 2004 genta é¸æŠžè§£é™¤å‰ã«å‰å›žã®ä½ç½®ã‚’記憶ã—ã¦é¸æŠžè§£é™¤ int n = List_GetCurSel( GetDlgItem( GetHwnd(), IDC_LIST_DIFF_FILES ) ); if( n != LB_ERR ){ m_nIndexSave = n; @@ -460,7 +460,7 @@ BOOL CDlgDiff::OnEnChange( HWND hwndCtl, int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnEnChange( hwndCtl, wID ); } @@ -519,7 +519,7 @@ BOOL CDlgDiff::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) BOOL CDlgDiff::OnSize( WPARAM wParam, LPARAM lParam ) { - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ CDialog::OnSize( wParam, lParam ); ::GetWindowRect( GetHwnd(), &GetDllShareData().m_Common.m_sOthers.m_rcDiffDialog ); diff --git a/sakura_core/dlg/CDlgDiff.h b/sakura_core/dlg/CDlgDiff.h index c4f0b9588c..e9b24d17a7 100644 --- a/sakura_core/dlg/CDlgDiff.h +++ b/sakura_core/dlg/CDlgDiff.h @@ -1,5 +1,5 @@ -/*! @file - @brief DIFF·•ª•\Ž¦ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief DIFF差分表示ダイアログボックス @author MIK @date 2002.5.27 @@ -36,9 +36,9 @@ class CDlgDiff; #include "dlg/CDialog.h" /*! - @brief DIFF·•ª•\Ž¦ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief DIFF差分表示ダイアログボックス */ -// Feb. 28, 2004 genta ÅŒã‚É‘I‘ð‚³‚ê‚Ä‚¢‚½”Ô†‚ð•Û‘¶‚·‚é +// Feb. 28, 2004 genta 最後ã«é¸æŠžã•ã‚Œã¦ã„ãŸç•ªå·ã‚’ä¿å­˜ã™ã‚‹ class CDlgDiff : public CDialog { public: @@ -50,39 +50,39 @@ class CDlgDiff : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR* ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR* ); /* モーダルダイアログã®è¡¨ç¤º */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnBnClicked( int ); BOOL OnLbnSelChange( HWND hwndCtl, int wID ); BOOL OnLbnDblclk( int wID ); BOOL OnEnChange( HWND hwndCtl, int wID ); LPVOID GetHelpIdTable(void); - INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnSize( WPARAM wParam, LPARAM lParam ); BOOL OnMove( WPARAM wParam, LPARAM lParam ); BOOL OnMinMaxInfo( LPARAM lParam ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ private: - int m_nIndexSave; // ÅŒã‚É‘I‘ð‚³‚ê‚Ä‚¢‚½”Ô† + int m_nIndexSave; // 最後ã«é¸æŠžã•ã‚Œã¦ã„ãŸç•ªå· POINT m_ptDefaultSize; RECT m_rcItems[22]; public: - SFilePath m_szFile1; // Ž©ƒtƒ@ƒCƒ‹ - SFilePath m_szFile2; // ‘ŠŽèƒtƒ@ƒCƒ‹ - bool m_bIsModifiedDst; // ‘ŠŽèƒtƒ@ƒCƒ‹XV’† - ECodeType m_nCodeTypeDst; // ‘ŠŽèƒtƒ@ƒCƒ‹‚Ì•¶ŽšƒR[ƒh - bool m_bBomDst; // ‘ŠŽèƒtƒ@ƒCƒ‹‚ÌBOM - int m_nDiffFlgOpt; // DIFFƒIƒvƒVƒ‡ƒ“ - HWND m_hWnd_Dst; // ‘ŠŽèƒEƒCƒ“ƒhƒEƒnƒ“ƒhƒ‹ + SFilePath m_szFile1; // 自ファイル + SFilePath m_szFile2; // 相手ファイル + bool m_bIsModifiedDst; // 相手ファイル更新中 + ECodeType m_nCodeTypeDst; // 相手ファイルã®æ–‡å­—コード + bool m_bBomDst; // 相手ファイルã®BOM + int m_nDiffFlgOpt; // DIFFオプション + HWND m_hWnd_Dst; // 相手ウインドウãƒãƒ³ãƒ‰ãƒ« }; diff --git a/sakura_core/dlg/CDlgExec.cpp b/sakura_core/dlg/CDlgExec.cpp index 8266fd2e63..950db019b8 100644 --- a/sakura_core/dlg/CDlgExec.cpp +++ b/sakura_core/dlg/CDlgExec.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ŠO•”ƒRƒ}ƒ“ƒhŽÀsƒ_ƒCƒAƒƒO +/*! @file + @brief 外部コマンド実行ダイアログ @author Norio Nakatani */ @@ -19,7 +19,7 @@ #include "StdAfx.h" #include "dlg/CDlgExec.h" #include "dlg/CDlgOpenFile.h" //Mar. 28, 2001 JEPRO -#include "func/Funccode.h" //Stonee, 2001/03/12 ƒRƒƒ“ƒgƒAƒEƒg‚³‚ê‚Ä‚½‚Ì‚ð—LŒø‚É‚µ‚½ +#include "func/Funccode.h" //Stonee, 2001/03/12 コメントアウトã•ã‚Œã¦ãŸã®ã‚’有効ã«ã—㟠#include "util/shell.h" #include "util/window.h" #include "_main/CAppMode.h" @@ -27,29 +27,29 @@ #include "sakura_rc.h" #include "sakura.hh" -//ŠO•”ƒRƒ}ƒ“ƒh CDlgExec.cpp //@@@ 2002.01.07 add start MIK +//外部コマンド CDlgExec.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12100 - IDC_BUTTON_REFERENCE, HIDC_EXEC_BUTTON_REFERENCE, //ŽQÆ - IDOK, HIDOK_EXEC, //ŽÀs - IDCANCEL, HIDCANCEL_EXEC, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_EXEC_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHECK_GETSTDOUT, HIDC_EXEC_CHECK_GETSTDOUT, //•W€o—͂𓾂é - IDC_COMBO_CODE_GET, HIDC_COMBO_CODE_GET, //•W€o—Í•¶ŽšƒR[ƒh - IDC_COMBO_m_szCommand, HIDC_EXEC_COMBO_m_szCommand, //ƒRƒ}ƒ“ƒh - IDC_RADIO_OUTPUT, HIDC_RADIO_OUTPUT, //•W€o—̓Šƒ_ƒCƒŒƒNƒgæFƒAƒEƒgƒvƒbƒgƒEƒBƒ“ƒhƒE - IDC_RADIO_EDITWINDOW, HIDC_RADIO_EDITWINDOW, //•W€o—̓Šƒ_ƒCƒŒƒNƒgæF•ÒW’†‚̃EƒBƒ“ƒhƒE - IDC_CHECK_SENDSTDIN, HIDC_CHECK_SENDSTDIN, //•W€“ü—Í‚É‘—‚é - IDC_COMBO_CODE_SEND, HIDC_COMBO_CODE_SEND, //•W€o—Í•¶ŽšƒR[ƒh - IDC_CHECK_CUR_DIR, HIDC_CHECK_CUR_DIR, //ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ - IDC_COMBO_CUR_DIR, HIDC_COMBO_CUR_DIR, //ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠŽw’è - IDC_BUTTON_REFERENCE2, HIDC_COMBO_CUR_DIR, //ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠŽw’è(ŽQÆ) + IDC_BUTTON_REFERENCE, HIDC_EXEC_BUTTON_REFERENCE, //å‚ç…§ + IDOK, HIDOK_EXEC, //実行 + IDCANCEL, HIDCANCEL_EXEC, //キャンセル + IDC_BUTTON_HELP, HIDC_EXEC_BUTTON_HELP, //ヘルプ + IDC_CHECK_GETSTDOUT, HIDC_EXEC_CHECK_GETSTDOUT, //標準出力を得る + IDC_COMBO_CODE_GET, HIDC_COMBO_CODE_GET, //標準出力文字コード + IDC_COMBO_m_szCommand, HIDC_EXEC_COMBO_m_szCommand, //コマンド + IDC_RADIO_OUTPUT, HIDC_RADIO_OUTPUT, //標準出力リダイレクト先：アウトプットウィンドウ + IDC_RADIO_EDITWINDOW, HIDC_RADIO_EDITWINDOW, //標準出力リダイレクト先：編集中ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ + IDC_CHECK_SENDSTDIN, HIDC_CHECK_SENDSTDIN, //標準入力ã«é€ã‚‹ + IDC_COMBO_CODE_SEND, HIDC_COMBO_CODE_SEND, //標準出力文字コード + IDC_CHECK_CUR_DIR, HIDC_CHECK_CUR_DIR, //カレントディレクトリ + IDC_COMBO_CUR_DIR, HIDC_COMBO_CUR_DIR, //カレントディレクトリ指定 + IDC_BUTTON_REFERENCE2, HIDC_COMBO_CUR_DIR, //カレントディレクトリ指定(å‚ç…§) // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK CDlgExec::CDlgExec() { - m_szCommand[0] = _T('\0'); /* ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ */ + m_szCommand[0] = _T('\0'); /* コマンドライン */ return; } @@ -58,10 +58,10 @@ static const int codeTable2[] = { 0x00, 0x10, 0x100 }; -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgExec::DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam ) { - m_szCommand[0] = _T('\0'); /* ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ */ + m_szCommand[0] = _T('\0'); /* コマンドライン */ m_bEditable = CEditDoc::GetInstance(0)->IsEditable(); return (int)CDialog::DoModal( hInstance, hwndParent, IDD_EXEC, lParam ); } @@ -94,7 +94,7 @@ BOOL CDlgExec::OnInitDialog( HWND hwnd, WPARAM wParam, LPARAM lParam ) return bRet; } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgExec::SetData( void ) { // MYTRACE( _T("CDlgExec::SetData()") ); @@ -102,20 +102,20 @@ void CDlgExec::SetData( void ) HWND hwndCombo; /***************************** - * ‰Šú * + * åˆæœŸ * *****************************/ - /* ƒ†[ƒU[‚ªƒRƒ“ƒ{ ƒ{ƒbƒNƒX‚̃GƒfƒBƒbƒg ƒRƒ“ƒgƒ[ƒ‹‚É“ü—Í‚Å‚«‚éƒeƒLƒXƒg‚Ì’·‚³‚ð§ŒÀ‚·‚é */ + /* ユーザーãŒã‚³ãƒ³ãƒœ ボックスã®ã‚¨ãƒ‡ã‚£ãƒƒãƒˆ コントロールã«å…¥åŠ›ã§ãるテキストã®é•·ã•ã‚’制é™ã™ã‚‹ */ Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_m_szCommand ), _countof( m_szCommand ) - 1 ); Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_CUR_DIR ), _countof2( m_szCurDir ) - 1 ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_m_szCommand ), TRUE ); - { // From Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß - // ƒ}ƒNƒ‚©‚ç‚̌ĂÑo‚µ‚Å‚ÍShareData‚É•Û‘¶‚³‚¹‚È‚¢‚悤‚ÉCShareData‚Ƃ̎󂯓n‚µ‚ÍExecCmd‚ÌŠO‚Å + { // From Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ + // マクロã‹ã‚‰ã®å‘¼ã³å‡ºã—ã§ã¯ShareDataã«ä¿å­˜ã•ã›ãªã„よã†ã«ï¼ŒShareDataã¨ã®å—ã‘渡ã—ã¯ExecCmdã®å¤–㧠int nExecFlgOpt; nExecFlgOpt = m_pShareData->m_nExecFlgOpt; - // ƒrƒ…[ƒ‚[ƒh‚âã‘‚«‹ÖŽ~‚Ì‚Æ‚«‚Í•ÒW’†ƒEƒBƒ“ƒhƒE‚Ö‚Ío—Í‚µ‚È‚¢ // 2009.02.21 ryoji + // ビューモードや上書ãç¦æ­¢ã®ã¨ãã¯ç·¨é›†ä¸­ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¸ã¯å‡ºåŠ›ã—ãªã„ // 2009.02.21 ryoji if( !m_bEditable ){ nExecFlgOpt &= ~0x02; } @@ -128,14 +128,14 @@ void CDlgExec::SetData( void ) ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_OUTPUT ), nExecFlgOpt & 0x01 ? TRUE : FALSE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_EDITWINDOW ), ((nExecFlgOpt & 0x01) && m_bEditable)? TRUE : FALSE ); - ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_CODE_GET ), nExecFlgOpt & 0x01 ? TRUE : FALSE ); // •W€o—ÍOffŽžAUnicode‚ðŽg—p‚·‚é‚ðDesable‚·‚é 2008/6/20 Uchi - ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_CODE_SEND ), nExecFlgOpt & 0x04 ? TRUE : FALSE ); // •W€“ü—ÍOffŽžAUnicode‚ðŽg—p‚·‚é‚ðDesable‚·‚é 2008/6/20 Uchi + ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_CODE_GET ), nExecFlgOpt & 0x01 ? TRUE : FALSE ); // 標準出力Off時ã€Unicodeを使用ã™ã‚‹ã‚’Desableã™ã‚‹ 2008/6/20 Uchi + ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_CODE_SEND ), nExecFlgOpt & 0x04 ? TRUE : FALSE ); // 標準入力Off時ã€Unicodeを使用ã™ã‚‹ã‚’Desableã™ã‚‹ 2008/6/20 Uchi ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_CUR_DIR ), nExecFlgOpt & 0x200 ? TRUE : FALSE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_REFERENCE2 ), nExecFlgOpt & 0x200 ? TRUE : FALSE ); - } // To Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß + } // To Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ /***************************** - * ƒf[ƒ^Ý’è * + * データ設定 * *****************************/ _tcscpy( m_szCommand, m_pShareData->m_sHistory.m_aCommands[0] ); hwndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_m_szCommand ); @@ -179,7 +179,7 @@ void CDlgExec::SetData( void ) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +/* ダイアログデータã®å–å¾— */ int CDlgExec::GetData( void ) { DlgItem_GetText( GetHwnd(), IDC_COMBO_m_szCommand, m_szCommand, _countof( m_szCommand )); @@ -188,20 +188,20 @@ int CDlgExec::GetData( void ) }else{ m_szCurDir[0] = _T('\0'); } - { // From Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß - // ƒ}ƒNƒ‚©‚ç‚̌ĂÑo‚µ‚Å‚ÍShareData‚É•Û‘¶‚³‚¹‚È‚¢‚悤‚ÉCShareData‚Ƃ̎󂯓n‚µ‚ÍExecCmd‚ÌŠO‚Å + { // From Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ + // マクロã‹ã‚‰ã®å‘¼ã³å‡ºã—ã§ã¯ShareDataã«ä¿å­˜ã•ã›ãªã„よã†ã«ï¼ŒShareDataã¨ã®å—ã‘渡ã—ã¯ExecCmdã®å¤–㧠int nFlgOpt = 0; - nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_GETSTDOUT ) ) ? 0x01 : 0; // •W€o—͂𓾂é - nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_EDITWINDOW ) ) ? 0x02 : 0; // •W€o—Í‚ð•ÒW’†‚̃EƒCƒ“ƒhƒE‚Ö - nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SENDSTDIN ) ) ? 0x04 : 0; // •ÒW’†ƒtƒ@ƒCƒ‹‚ð•W€“ü—Í‚Ö - nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_CUR_DIR ) ) ? 0x200 : 0; // ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠŽw’è + nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_GETSTDOUT ) ) ? 0x01 : 0; // 標準出力を得る + nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_EDITWINDOW ) ) ? 0x02 : 0; // 標準出力を編集中ã®ã‚¦ã‚¤ãƒ³ãƒ‰ã‚¦ã¸ + nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SENDSTDIN ) ) ? 0x04 : 0; // 編集中ファイルを標準入力㸠+ nFlgOpt |= ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_CUR_DIR ) ) ? 0x200 : 0; // カレントディレクトリ指定 int sel; sel = Combo_GetCurSel( GetItemHwnd( IDC_COMBO_CODE_GET ) ); nFlgOpt |= codeTable1[sel]; sel = Combo_GetCurSel( GetItemHwnd( IDC_COMBO_CODE_SEND ) ); nFlgOpt |= codeTable2[sel]; m_pShareData->m_nExecFlgOpt = nFlgOpt; - } // To Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß + } // To Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ return 1; } @@ -211,20 +211,20 @@ BOOL CDlgExec::OnBnClicked( int wID ) { switch( wID ){ case IDC_CHECK_GETSTDOUT: - { // From Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß + { // From Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ BOOL bEnabled; bEnabled = (BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_GETSTDOUT)) ? TRUE : FALSE; ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_OUTPUT ), bEnabled ); - ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_EDITWINDOW ), (bEnabled && m_bEditable) ? TRUE : FALSE ); // ƒrƒ…[ƒ‚[ƒh‚âã‘‚«‹ÖŽ~‚ÌðŒ’ljÁ // 2009.02.21 ryoji - } // To Here 2007.01.02 maru ˆø”‚ðŠg’£‚Ì‚½‚ß + ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_EDITWINDOW ), (bEnabled && m_bEditable) ? TRUE : FALSE ); // ビューモードや上書ãç¦æ­¢ã®æ¡ä»¶è¿½åŠ  // 2009.02.21 ryoji + } // To Here 2007.01.02 maru 引数を拡張ã®ãŸã‚ - // •W€o—ÍOffŽžAUnicode‚ðŽg—p‚·‚é‚ðDesable‚·‚é 2008/6/20 Uchi + // 標準出力Off時ã€Unicodeを使用ã™ã‚‹ã‚’Desableã™ã‚‹ 2008/6/20 Uchi ::EnableWindow( GetItemHwnd( IDC_COMBO_CODE_GET ), BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_GETSTDOUT ) ); break; - case IDC_CHECK_SENDSTDIN: // •W€“ü—ÍOffŽžAUnicode‚ðŽg—p‚·‚é‚ðDesable‚·‚é 2008/6/20 Uchi + case IDC_CHECK_SENDSTDIN: // 標準入力Off時ã€Unicodeを使用ã™ã‚‹ã‚’Desableã™ã‚‹ 2008/6/20 Uchi ::EnableWindow( GetItemHwnd( IDC_COMBO_CODE_SEND ), BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SENDSTDIN ) ); break; @@ -236,20 +236,20 @@ BOOL CDlgExec::OnBnClicked( int wID ) break; case IDC_BUTTON_HELP: - /* uŒŸõv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_EXECMD_DIALOG) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「検索ã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_EXECMD_DIALOG) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ break; //From Here Mar. 28, 2001 JEPRO - case IDC_BUTTON_REFERENCE: /* ƒtƒ@ƒCƒ‹–¼‚ÌuŽQÆ...vƒ{ƒ^ƒ“ */ + case IDC_BUTTON_REFERENCE: /* ファイルåã®ã€Œå‚ç…§...ã€ãƒœã‚¿ãƒ³ */ { CDlgOpenFile cDlgOpenFile; TCHAR szPath[_MAX_PATH + 1]; int size = _countof(szPath) - 1; _tcsncpy( szPath, m_szCommand, size); szPath[size] = _T('\0'); - /* ƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒ_ƒCƒAƒƒO‚̉Šú‰» */ + /* ファイルオープンダイアログã®åˆæœŸåŒ– */ cDlgOpenFile.Create( m_hInstance, GetHwnd(), @@ -273,8 +273,8 @@ BOOL CDlgExec::OnBnClicked( int wID ) } return TRUE; - case IDOK: /* ‰ºŒŸõ */ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDOK: /* 下検索 */ + /* ダイアログデータã®å–å¾— */ GetData(); CloseDialog( 1 ); return TRUE; diff --git a/sakura_core/dlg/CDlgExec.h b/sakura_core/dlg/CDlgExec.h index 61b8ba1fa7..56b67fa9c3 100644 --- a/sakura_core/dlg/CDlgExec.h +++ b/sakura_core/dlg/CDlgExec.h @@ -1,5 +1,5 @@ -/*! @file - @brief ŠO•”ƒRƒ}ƒ“ƒhŽÀsƒ_ƒCƒAƒƒO +/*! @file + @brief 外部コマンド実行ダイアログ @author Norio Nakatani */ @@ -18,7 +18,7 @@ #define _CDLGEXEC_H_ /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ class CDlgExec : public CDialog { @@ -30,11 +30,11 @@ class CDlgExec : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ - TCHAR m_szCommand[1024 + 1]; /* ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ */ - SFilePath m_szCurDir; /* ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ */ - bool m_bEditable; /* •ÒWƒEƒBƒ“ƒhƒE‚Ö‚Ì“ü—͉”\ */ // 2009.02.21 ryoji + TCHAR m_szCommand[1024 + 1]; /* コマンドライン */ + SFilePath m_szCurDir; /* カレントディレクトリ */ + bool m_bEditable; /* 編集ウィンドウã¸ã®å…¥åŠ›å¯èƒ½ */ // 2009.02.21 ryoji protected: @@ -43,9 +43,9 @@ class CDlgExec : public CDialog SComboBoxItemDeleter m_comboDelCur; CRecentCurDir m_cRecentCur; - /* ƒI[ƒo[ƒ‰ƒCƒh? */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + /* オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰? */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add diff --git a/sakura_core/dlg/CDlgFavorite.cpp b/sakura_core/dlg/CDlgFavorite.cpp index 90947ad74a..b42d624791 100644 --- a/sakura_core/dlg/CDlgFavorite.cpp +++ b/sakura_core/dlg/CDlgFavorite.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief —š—ð‚ÌŠÇ—ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 履歴ã®ç®¡ç†ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author MIK @date 2003.4.8 @@ -47,24 +47,24 @@ #include "sakura.hh" const DWORD p_helpids[] = { - IDC_TAB_FAVORITE, HIDC_TAB_FAVORITE, //ƒ^ƒu - IDC_LIST_FAVORITE_FILE, HIDC_LIST_FAVORITE_FILE, //ƒtƒ@ƒCƒ‹ - IDC_LIST_FAVORITE_FOLDER, HIDC_LIST_FAVORITE_FOLDER, //ƒtƒHƒ‹ƒ_ - IDC_LIST_FAVORITE_EXCEPTMRU, HIDC_LIST_FAVORITE_EXCEPTMRU, //MRUœŠO - IDC_LIST_FAVORITE_SEARCH, HIDC_LIST_FAVORITE_SEARCH, //ŒŸõ - IDC_LIST_FAVORITE_REPLACE, HIDC_LIST_FAVORITE_REPLACE, //’uŠ· - IDC_LIST_FAVORITE_GREP_FILE, HIDC_LIST_FAVORITE_GREPFILE, //GREPƒtƒ@ƒCƒ‹ - IDC_LIST_FAVORITE_GREP_FOLDER, HIDC_LIST_FAVORITE_GREPFOLDER, //GREPƒtƒHƒ‹ƒ_ - IDC_LIST_FAVORITE_CMD, HIDC_LIST_FAVORITE_CMD, //ƒRƒ}ƒ“ƒh - IDC_LIST_FAVORITE_CUR_DIR, HIDC_LIST_FAVORITE_CUR_DIR, //ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ + 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_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_CMD, HIDC_LIST_FAVORITE_CMD, //コマンド + IDC_LIST_FAVORITE_CUR_DIR, HIDC_LIST_FAVORITE_CUR_DIR, //カレントディレクトリ // IDC_STATIC_BUTTONS, -1, - IDC_BUTTON_CLEAR, HIDC_BUTTON_FAVORITE_CLEAR, //‚·‚×‚Ä // 2006.10.10 ryoji - IDC_BUTTON_DELETE_NOFAVORATE, HIDC_BUTTON_FAVORITE_DELETE_NOFAVORATE, //‚¨‹C‚É“ü‚èˆÈŠO - IDC_BUTTON_DELETE_NOTFOUND, HIDC_BUTTON_FAVORITE_DELETE_NOTFOUND , //‘¶Ý‚µ‚È‚¢€–Ú - IDC_BUTTON_DELETE_SELECTED, HIDC_BUTTON_FAVORITE_DELETE_SELECTED, //‘I‘ð€–Ú - IDC_BUTTON_ADD_FAVORITE, HIDC_BUTTON_ADD_FAVORITE, // ’ljÁ - IDOK, HIDC_FAVORITE_IDOK, //•Â‚¶‚é - IDC_BUTTON_HELP, HIDC_BUTTON_FAVORITE_HELP, //ƒwƒ‹ƒv + IDC_BUTTON_CLEAR, HIDC_BUTTON_FAVORITE_CLEAR, //ã™ã¹ã¦ // 2006.10.10 ryoji + IDC_BUTTON_DELETE_NOFAVORATE, HIDC_BUTTON_FAVORITE_DELETE_NOFAVORATE, //ãŠæ°—ã«å…¥ã‚Šä»¥å¤– + IDC_BUTTON_DELETE_NOTFOUND, HIDC_BUTTON_FAVORITE_DELETE_NOTFOUND , //存在ã—ãªã„é …ç›® + IDC_BUTTON_DELETE_SELECTED, HIDC_BUTTON_FAVORITE_DELETE_SELECTED, //é¸æŠžé …ç›® + IDC_BUTTON_ADD_FAVORITE, HIDC_BUTTON_ADD_FAVORITE, // 追加 + IDOK, HIDC_FAVORITE_IDOK, //é–‰ã˜ã‚‹ + IDC_BUTTON_HELP, HIDC_BUTTON_FAVORITE_HELP, //ヘルプ // IDC_STATIC_FAVORITE_MSG, -1, 0, 0 }; @@ -82,7 +82,7 @@ static const SAnchorList anchorList[] = { {IDC_STATIC_FAVORITE_MSG, ANCHOR_BOTTOM}, }; -//SDK‚É‚µ‚©’è‹`‚³‚ê‚Ä‚¢‚È‚¢B +//SDKã«ã—ã‹å®šç¾©ã•ã‚Œã¦ã„ãªã„。 #ifndef ListView_SetCheckState //#if (_WIN32_IE >= 0x0300) #define ListView_SetCheckState(hwndLV, i, fCheck) \ @@ -103,11 +103,11 @@ struct CompareListViewLParam }; /* - CRecent‚ÌŠeŽÀ‘•ƒNƒ‰ƒX‚Í DLLSHAREDATA ‚Ö’¼ÚƒAƒNƒZƒX‚µ‚Ä‚¢‚éB - —š—ð‚Í‚Ù‚©‚̃EƒBƒ“ƒhƒE‚ª‘‚«Š·‚¦‚é‰Â”\«‚ª‚ ‚邽‚ßA - ƒ_ƒCƒAƒƒO‚ªƒAƒNƒeƒBƒu‚É‚È‚Á‚½Û‚É•ÏX‚ðŠm”F‚µÄŽæ“¾‚·‚é‚悤‚É‚È‚Á‚Ä‚¢‚éB - •ÒW’†‚Í•ÏX‚ðŠm”F‚µ‚Ä‚¢‚È‚¢‚Ì‚ÅA— ‚ÅDLLSHAREDATA‚ð•ÏX‚³‚ê‚é‚ÆListView‚Æ - DLLSHAREDATA‚ªˆê’v‚µ‚È‚¢‰Â”\«‚à‚ ‚éB + CRecentã®å„実装クラス㯠DLLSHAREDATA ã¸ç›´æŽ¥ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„る。 + 履歴ã¯ã»ã‹ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒæ›¸ãæ›ãˆã‚‹å¯èƒ½æ€§ãŒã‚ã‚‹ãŸã‚〠+ ダイアログãŒã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã£ãŸéš›ã«å¤‰æ›´ã‚’確èªã—å†å–å¾—ã™ã‚‹ã‚ˆã†ã«ãªã£ã¦ã„る。 + 編集中ã¯å¤‰æ›´ã‚’確èªã—ã¦ã„ãªã„ã®ã§ã€è£ã§DLLSHAREDATAを変更ã•ã‚Œã‚‹ã¨ListView㨠+ DLLSHAREDATAãŒä¸€è‡´ã—ãªã„å¯èƒ½æ€§ã‚‚ã‚る。 */ @@ -119,7 +119,7 @@ CDlgFavorite::CDlgFavorite() m_nCurrentTab = 0; _tcscpy( m_szMsg, _T("") ); - /* ƒTƒCƒY•ÏXŽž‚Ɉʒu‚ð§Œä‚·‚éƒRƒ“ƒgƒ[ƒ‹” */ + /* サイズ変更時ã«ä½ç½®ã‚’制御ã™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«æ•° */ assert( _countof(anchorList) == _countof(m_rcItems) ); { @@ -233,7 +233,7 @@ CDlgFavorite::CDlgFavorite() m_aFavoriteInfo[i].m_bEditable = false; m_aFavoriteInfo[i].m_bAddExcept = false; - /* ‚±‚êˆÈã‘‚â‚·‚Æ‚«‚̓e[ƒuƒ‹ƒTƒCƒY‚à‘‚«Š·‚¦‚Ä‚Ë */ + /* ã“れ以上増やã™ã¨ãã¯ãƒ†ãƒ¼ãƒ–ルサイズも書ãæ›ãˆã¦ã­ */ assert( i < _countof(m_aFavoriteInfo) ); } for( i = 0; i < FAVORITE_INFO_MAX; i++ ){ @@ -253,7 +253,7 @@ CDlgFavorite::~CDlgFavorite() } } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgFavorite::DoModal( HINSTANCE hInstance, HWND hwndParent, @@ -263,7 +263,7 @@ int CDlgFavorite::DoModal( return (int)CDialog::DoModal( hInstance, hwndParent, IDD_FAVORITE, lParam ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgFavorite::SetData( void ) { int nTab; @@ -280,9 +280,9 @@ void CDlgFavorite::SetData( void ) return; } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚Ì1‚‚̃^ƒu‚ÌÝ’èEXV - @param nIndex ƒ^ƒu‚ÌIndex - @param nLvItemIndex ‘I‘ðE•\Ž¦‚µ‚½‚¢ListView‚ÌIndexB-1‚Å‘I‘ð‚µ‚È‚¢ +/* ダイアログデータã®1ã¤ã®ã‚¿ãƒ–ã®è¨­å®šãƒ»æ›´æ–° + @param nIndex タブã®Index + @param nLvItemIndex é¸æŠžãƒ»è¡¨ç¤ºã—ãŸã„ListViewã®Index。-1ã§é¸æŠžã—ãªã„ */ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex ) { @@ -292,9 +292,9 @@ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex ) const CRecent* pRecent = m_aFavoriteInfo[nIndex].m_pRecent; - /* ƒŠƒXƒg */ + /* リスト */ hwndList = ::GetDlgItem( GetHwnd(), m_aFavoriteInfo[nIndex].m_nId ); - ListView_DeleteAllItems( hwndList ); /* ƒŠƒXƒg‚ð‹ó‚É‚·‚é */ + ListView_DeleteAllItems( hwndList ); /* リストを空ã«ã™ã‚‹ */ const int nViewCount = pRecent->GetViewCount(); const int nItemCount = pRecent->GetItemCount(); @@ -328,7 +328,7 @@ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex ) } if( -1 != m_aListViewInfo[nIndex].nSortColumn ){ - //ƒ\[ƒg‚ðˆÛŽ + //ã‚½ãƒ¼ãƒˆã‚’ç¶­æŒ ListViewSort( m_aListViewInfo[nIndex], pRecent, m_aListViewInfo[nIndex].nSortColumn, false ); } @@ -337,7 +337,7 @@ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex ) nNewFocus = nLvItemIndex; } - //ƒAƒCƒeƒ€‚ª‚ ‚Á‚Ä‚Ç‚ê‚à”ñ‘I‘ð‚È‚çA—v‹‚É‹ß‚¢ƒAƒCƒeƒ€(擪‚©––”ö)‚ð‘I‘ð + //アイテムãŒã‚ã£ã¦ã©ã‚Œã‚‚éžé¸æŠžãªã‚‰ã€è¦æ±‚ã«è¿‘ã„アイテム(先頭ã‹æœ«å°¾)ã‚’é¸æŠž if( nItemCount > 0 && -1 != nLvItemIndex && nNewFocus == -1 ) { nNewFocus = (0 < nLvItemIndex ? nItemCount - 1: 0); @@ -352,9 +352,9 @@ void CDlgFavorite::SetDataOne( int nIndex, int nLvItemIndex ) return; } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚ðŽæ“¾‚µA‹¤—Lƒf[ƒ^‚Ì‚¨‹C‚É“ü‚è‚ðXV +/*! ダイアログデータをå–å¾—ã—ã€å…±æœ‰ãƒ‡ãƒ¼ã‚¿ã®ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–° - @retval TRUE ³í(¡‚Ì‚Æ‚±‚ëFALSE‚Í•Ô‚³‚È‚¢) + @retval TRUE 正常(今ã®ã¨ã“ã‚FALSEã¯è¿”ã•ãªã„) */ int CDlgFavorite::GetData( void ) { @@ -366,7 +366,7 @@ int CDlgFavorite::GetData( void ) { GetFavorite( nTab ); - //ƒŠƒXƒg‚ðXV‚·‚éB + //リストを更新ã™ã‚‹ã€‚ CRecent* pRecent = m_aFavoriteInfo[nTab].m_pRecent; pRecent->UpdateView(); } @@ -409,7 +409,7 @@ BOOL CDlgFavorite::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_nHeight = rcDialog.bottom - rcDialog.top; } - //ƒŠƒXƒgƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ðŽæ“¾‚·‚éB + //リストビューã®è¡¨ç¤ºä½ç½®ã‚’å–å¾—ã™ã‚‹ã€‚ m_nCurrentTab = 0; hwndBaseList = ::GetDlgItem( hwndDlg, m_aFavoriteInfo[0].m_nId ); { @@ -418,7 +418,7 @@ BOOL CDlgFavorite::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_rcListDefault = rc; } - // ƒEƒBƒ“ƒhƒE‚̃ŠƒTƒCƒY + // ウィンドウã®ãƒªã‚µã‚¤ã‚º SetDialogPosSize(); hwndTab = ::GetDlgItem( hwndDlg, IDC_TAB_FAVORITE ); @@ -426,22 +426,22 @@ BOOL CDlgFavorite::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) GetItemClientRect( m_aFavoriteInfo[0].m_nId, rc ); - // ƒŠƒXƒgƒrƒ…[‚ÌItem/SubItem•‚ðŒvŽZ + // リストビューã®Item/SubItem幅を計算 std::tstring pszFavTest = LS( STR_DLGFAV_FAVORITE ); TCHAR* pszFAVORITE_TEXT = const_cast(pszFavTest.c_str()); const int nListViewWidthClient = rc.right - rc.left - CTextWidthCalc::WIDTH_MARGIN_SCROLLBER - ::GetSystemMetrics(SM_CXVSCROLL); - // ‰Šú’l‚Í]—ˆ•ûŽ®‚Ì%Žw’è + // åˆæœŸå€¤ã¯å¾“æ¥æ–¹å¼ã®%指定 int nItemCx = nListViewWidthClient * 16 / 100; int nSubItem1Cx = nListViewWidthClient * 79 / 100; { - // “K—p‚³‚ê‚Ä‚¢‚éƒtƒHƒ“ƒg‚©‚çŽZo + // é©ç”¨ã•ã‚Œã¦ã„るフォントã‹ã‚‰ç®—出 CTextWidthCalc calc( hwndBaseList ); calc.SetTextWidthIfMax( pszFAVORITE_TEXT, CTextWidthCalc::WIDTH_LV_HEADER ); TCHAR szBuf[200]; for(int i = 0; i < 40; i++ ){ - // uM (”ñ•\Ž¦)v“™‚Ì•‚ð‹‚ß‚é + // 「M (éžè¡¨ç¤º)ã€ç­‰ã®å¹…を求ã‚ã‚‹ FormatFavoriteColumn( szBuf, _countof(szBuf), i, false); calc.SetTextWidthIfMax( szBuf, CTextWidthCalc::WIDTH_LV_ITEM_CHECKBOX ); } @@ -474,13 +474,13 @@ BOOL CDlgFavorite::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) col.iSubItem = 1; ListView_InsertColumn( hwndList, 1, &col ); - /* s‘I‘ð */ + /* è¡Œé¸æŠž */ lngStyle = ListView_GetExtendedListViewStyle( hwndList ); lngStyle |= LVS_EX_FULLROWSELECT; if( m_aFavoriteInfo[nTab].m_bHaveFavorite ) lngStyle |= LVS_EX_CHECKBOXES; ListView_SetExtendedListViewStyle( hwndList, lngStyle ); - /* ƒ^ƒu€–ڒljÁ */ + /* タブ項目追加 */ tcitem.mask = TCIF_TEXT; tcitem.pszText = const_cast(m_aFavoriteInfo[nTab].m_pszCaption); TabCtrl_InsertItem( hwndTab, nTab, &tcitem ); @@ -499,31 +499,31 @@ BOOL CDlgFavorite::OnBnClicked( int wID ) switch( wID ) { case IDC_BUTTON_HELP: - /* ƒwƒ‹ƒv */ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID( F_FAVORITE ) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* ヘルプ */ + MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID( F_FAVORITE ) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; case IDOK: - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), (BOOL)GetData() ); return TRUE; case IDCANCEL: - // 2010.03.20 ƒLƒƒƒ“ƒZƒ‹‚ð”pŽ~BOK‚Æ“¯‚¶‚É‚·‚éB - // [X]ƒ{ƒ^ƒ“‚ð‰Ÿ‚·‚ƒʉ߂·‚é + // 2010.03.20 キャンセルを廃止。OKã¨åŒã˜ã«ã™ã‚‹ã€‚ + // [X]ボタンを押ã™ã¨é€šéŽã™ã‚‹ ::EndDialog( GetHwnd(), (BOOL)GetData() ); return TRUE; - // 2010.03.20 Moca u‚¨‹C‚É“ü‚èˆÈŠO‚©‚·‚ׂÄíœv‘I‘ðƒƒbƒZ[ƒWƒ{ƒbƒNƒX‚ð”pŽ~‚µ - // ‚»‚ꂼ‚ê‚̃{ƒ^ƒ“‚É•ÏX - //‚·‚ׂÄíœ + // 2010.03.20 Moca 「ãŠæ°—ã«å…¥ã‚Šä»¥å¤–ã‹ã™ã¹ã¦å‰Šé™¤ã€é¸æŠžãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãƒœãƒƒã‚¯ã‚¹ã‚’廃止㗠+ // ãã‚Œãžã‚Œã®ãƒœã‚¿ãƒ³ã«å¤‰æ›´ + //ã™ã¹ã¦å‰Šé™¤ case IDC_BUTTON_CLEAR: { ::DlgItem_SetText( GetHwnd(), IDC_STATIC_FAVORITE_MSG, _T("") ); CRecent *pRecent = m_aFavoriteInfo[m_nCurrentTab].m_pRecent; if( pRecent ){ const int nRet = ConfirmMessage( GetHwnd(), - LS( STR_DLGFAV_CONF_DEL_FAV ), // "ŋߎg‚Á‚½%ts‚Ì—š—ð‚ð휂µ‚Ü‚·B\n‚æ‚낵‚¢‚Å‚·‚©H\n" + LS( STR_DLGFAV_CONF_DEL_FAV ), // "最近使ã£ãŸ%tsã®å±¥æ­´ã‚’削除ã—ã¾ã™ã€‚\nよã‚ã—ã„ã§ã™ã‹ï¼Ÿ\n" m_aFavoriteInfo[m_nCurrentTab].m_pszCaption ); if( IDYES == nRet ){ pRecent->DeleteAllItem(); @@ -533,13 +533,13 @@ BOOL CDlgFavorite::OnBnClicked( int wID ) } } return TRUE; - //‚¨‹C‚É“ü‚èˆÈŠOíœ + //ãŠæ°—ã«å…¥ã‚Šä»¥å¤–削除 case IDC_BUTTON_DELETE_NOFAVORATE: { ::DlgItem_SetText( GetHwnd(), IDC_STATIC_FAVORITE_MSG, _T("") ); if( m_aFavoriteInfo[m_nCurrentTab].m_bHaveFavorite ){ int const nRet = ConfirmMessage( GetHwnd(), - LS( STR_DLGFAV_CONF_DEL_NOTFAV ), // "ŋߎg‚Á‚½%ts‚Ì—š—ð‚Ì‚¨‹C‚É“ü‚èˆÈŠO‚ð휂µ‚Ü‚·B\n‚æ‚낵‚¢‚Å‚·‚©H" + LS( STR_DLGFAV_CONF_DEL_NOTFAV ), // "最近使ã£ãŸ%tsã®å±¥æ­´ã®ãŠæ°—ã«å…¥ã‚Šä»¥å¤–を削除ã—ã¾ã™ã€‚\nよã‚ã—ã„ã§ã™ã‹ï¼Ÿ" m_aFavoriteInfo[m_nCurrentTab].m_pszCaption ); CRecent * const pRecent = m_aFavoriteInfo[m_nCurrentTab].m_pRecent; if( IDYES == nRet && pRecent ){ @@ -552,19 +552,19 @@ BOOL CDlgFavorite::OnBnClicked( int wID ) } } return TRUE; - // ‘¶Ý‚µ‚È‚¢€–Ú ‚ðíœ + // 存在ã—ãªã„é …ç›® を削除 case IDC_BUTTON_DELETE_NOTFOUND: { ::DlgItem_SetText( GetHwnd(), IDC_STATIC_FAVORITE_MSG, _T("") ); if( m_aFavoriteInfo[m_nCurrentTab].m_bFilePath ){ const int nRet = ConfirmMessage( GetHwnd(), - LS( STR_DLGFAV_CONF_DEL_PATH ), // "ŋߎg‚Á‚½%ts‚Ì‘¶Ý‚µ‚È‚¢ƒpƒX‚ð휂µ‚Ü‚·B\n‚æ‚낵‚¢‚Å‚·‚©H" + LS( STR_DLGFAV_CONF_DEL_PATH ), // "最近使ã£ãŸ%tsã®å­˜åœ¨ã—ãªã„パスを削除ã—ã¾ã™ã€‚\nよã‚ã—ã„ã§ã™ã‹ï¼Ÿ" m_aFavoriteInfo[m_nCurrentTab].m_pszCaption ); CRecent * const pRecent = m_aFavoriteInfo[m_nCurrentTab].m_pRecent; if( IDYES == nRet && pRecent ){ GetFavorite( m_nCurrentTab ); - // ‘¶Ý‚µ‚È‚¢ƒpƒX‚Ìíœ + // 存在ã—ãªã„パスã®å‰Šé™¤ for( int i = pRecent->GetItemCount() - 1; i >= 0; i-- ){ size_t nLen = auto_strlen(pRecent->GetItemText(i)); std::vector vecPath(nLen + 2); @@ -582,7 +582,7 @@ BOOL CDlgFavorite::OnBnClicked( int wID ) } } return TRUE; - //‘I‘ð€–Ú‚Ìíœ + //é¸æŠžé …ç›®ã®å‰Šé™¤ case IDC_BUTTON_DELETE_SELECTED: { DeleteSelected(); @@ -595,7 +595,7 @@ BOOL CDlgFavorite::OnBnClicked( int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } @@ -635,7 +635,7 @@ BOOL CDlgFavorite::OnNotify( WPARAM wParam, LPARAM lParam ) } return TRUE; - // ListViewƒwƒbƒ_ƒNƒŠƒbƒN:ƒ\[ƒg‚·‚é + // ListViewヘッダクリック:ソートã™ã‚‹ case LVN_COLUMNCLICK: ListViewSort( m_aListViewInfo[m_nCurrentTab], @@ -643,7 +643,7 @@ BOOL CDlgFavorite::OnNotify( WPARAM wParam, LPARAM lParam ) pnlv->iSubItem, true ); return TRUE; - // ListView‚ÅDeleteƒL[‚ª‰Ÿ‚³‚ꂽ:íœ + // ListViewã§DeleteキーãŒæŠ¼ã•ã‚ŒãŸ:削除 case LVN_KEYDOWN: switch( ((NMLVKEYDOWN*)lParam)->wVKey ) { @@ -685,7 +685,7 @@ BOOL CDlgFavorite::OnNotify( WPARAM wParam, LPARAM lParam ) } } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnNotify( wParam, lParam ); } @@ -696,11 +696,11 @@ void CDlgFavorite::TabSelectChange(bool bSetFocus) int nIndex = TabCtrl_GetCurSel( hwndTab ); if( -1 != nIndex ) { - //V‚µ‚­•\Ž¦‚·‚éB + //æ–°ã—ã表示ã™ã‚‹ã€‚ HWND hwndList = GetItemHwnd( m_aFavoriteInfo[nIndex].m_nId ); ::ShowWindow( hwndList, SW_SHOW ); - //Œ»Ý•\Ž¦’†‚̃ŠƒXƒg‚ð‰B‚·B + //ç¾åœ¨è¡¨ç¤ºä¸­ã®ãƒªã‚¹ãƒˆã‚’éš ã™ã€‚ HWND hwndList2 = GetItemHwnd( m_aFavoriteInfo[m_nCurrentTab].m_nId ); ::ShowWindow( hwndList2, SW_HIDE ); @@ -732,7 +732,7 @@ BOOL CDlgFavorite::OnActivate( WPARAM wParam, LPARAM lParam ) break; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnActivate( wParam, lParam ); } @@ -742,7 +742,7 @@ LPVOID CDlgFavorite::GetHelpIdTable( void ) } /* - ƒŠƒXƒg‚ðXV‚·‚éB + リストを更新ã™ã‚‹ã€‚ */ bool CDlgFavorite::RefreshList( void ) { @@ -754,7 +754,7 @@ bool CDlgFavorite::RefreshList( void ) _tcscpy( msg, _T("") ); _tcscpy( m_szMsg, _T("") ); - //‘SƒŠƒXƒg‚ÌŒ»Ý‘I‘𒆂̃AƒCƒeƒ€‚ðŽæ“¾‚·‚éB + //全リストã®ç¾åœ¨é¸æŠžä¸­ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å–å¾—ã™ã‚‹ã€‚ for( nTab = 0; NULL != m_aFavoriteInfo[nTab].m_pRecent; nTab++ ) { bret = RefreshListOne( nTab ); @@ -770,7 +770,7 @@ bool CDlgFavorite::RefreshList( void ) if( ret_val ) { auto_snprintf_s( m_szMsg, _countof(m_szMsg), - LS( STR_DLGFAV_FAV_REFRESH ), // "—š—ð(%ts)‚ªXV‚³‚ꂽ‚½‚ß•ÒW’†î•ñ‚ð”jŠü‚µÄ•\Ž¦‚µ‚Ü‚µ‚½B" + LS( STR_DLGFAV_FAV_REFRESH ), // "履歴(%ts)ãŒæ›´æ–°ã•ã‚ŒãŸãŸã‚編集中情報を破棄ã—å†è¡¨ç¤ºã—ã¾ã—ãŸã€‚" msg ); } @@ -778,7 +778,7 @@ bool CDlgFavorite::RefreshList( void ) } /* - —š—ðŽí•ÊƒŠƒXƒg‚Ì‚¤‚¿1ŒÂ‚̃ŠƒXƒgƒrƒ…[‚ðXV‚·‚éB + 履歴種別リストã®ã†ã¡1個ã®ãƒªã‚¹ãƒˆãƒ“ューを更新ã™ã‚‹ã€‚ */ bool CDlgFavorite::RefreshListOne( int nIndex ) { @@ -797,9 +797,9 @@ bool CDlgFavorite::RefreshListOne( int nIndex ) nCurrentIndex = ListView_GetNextItem( hwndList, -1, LVNI_SELECTED ); if( -1 == nCurrentIndex ) nCurrentIndex = ListView_GetNextItem( hwndList, -1, LVNI_FOCUSED ); - if( nItemCount != nCount ) goto changed; //ŒÂ”‚ª•Ï‚í‚Á‚½‚Ì‚ÅÄ\’z + if( nItemCount != nCount ) goto changed; //個数ãŒå¤‰ã‚ã£ãŸã®ã§å†æ§‹ç¯‰ - //‚¨‹C‚É“ü‚蔂ª•Ï‚í‚Á‚½‚Ì‚ÅÄ\’z + //ãŠæ°—ã«å…¥ã‚Šæ•°ãŒå¤‰ã‚ã£ãŸã®ã§å†æ§‹ç¯‰ if( m_aFavoriteInfo[nIndex].m_nViewCount != pRecent->GetViewCount() ) goto changed; for( i = 0; i < nCount; i++ ) @@ -813,9 +813,9 @@ bool CDlgFavorite::RefreshListOne( int nIndex ) lvitem.iItem = i; lvitem.iSubItem = 1; bret = ListView_GetItem( hwndList, &lvitem ); - if( !bret ) goto changed; //ƒGƒ‰[‚È‚Ì‚ÅÄ\’z + if( !bret ) goto changed; //エラーãªã®ã§å†æ§‹ç¯‰ - //ƒAƒCƒeƒ€“à—e‚ª•Ï‚í‚Á‚½‚Ì‚ÅÄ\’z + //アイテム内容ãŒå¤‰ã‚ã£ãŸã®ã§å†æ§‹ç¯‰ if( lvitem.lParam != pRecent->FindItemByText( szText ) ) goto changed; } @@ -828,7 +828,7 @@ bool CDlgFavorite::RefreshListOne( int nIndex ) return true; } -// ‚¨‹C‚É“ü‚è‚̃tƒ‰ƒO‚¾‚¯“K—p +// ãŠæ°—ã«å…¥ã‚Šã®ãƒ•ãƒ©ã‚°ã ã‘é©ç”¨ void CDlgFavorite::GetFavorite( int nIndex ) { CRecent * const pRecent = m_aFavoriteInfo[nIndex].m_pRecent; @@ -845,8 +845,8 @@ void CDlgFavorite::GetFavorite( int nIndex ) /* - ‘I‘𒆂̀–Ú‚ðíœ - ƒŠƒXƒg‚ÌXV‚à‚·‚é + é¸æŠžä¸­ã®é …目を削除 + リストã®æ›´æ–°ã‚‚ã™ã‚‹ */ int CDlgFavorite::DeleteSelected() { @@ -873,7 +873,7 @@ int CDlgFavorite::DeleteSelected() } } std::sort(selRecIndexs.rbegin(),selRecIndexs.rend()); - // ‘å‚«‚¢‚Ù‚¤‚©‚ç휂µ‚È‚¢‚ÆACRecent‘¤‚Ìindex‚ª‚¸‚ê‚é + // 大ãã„ã»ã†ã‹ã‚‰å‰Šé™¤ã—ãªã„ã¨ã€CRecentå´ã®indexãŒãšã‚Œã‚‹ size_t nSize = selRecIndexs.size(); for( size_t n = 0; n < nSize; n++ ) { @@ -884,25 +884,25 @@ int CDlgFavorite::DeleteSelected() if( 0 < nDelItemCount ){ int nItem = nLastSelectedItem; if( -1 != nItem ){ - nItem += 1; // 휂µ‚½ƒAƒCƒeƒ€‚ÌŽŸ‚̃AƒCƒeƒ€ - nItem -= nDelItemCount; // V‚µ‚¢ˆÊ’u‚ÍA휂µ‚½•ª‚¾‚¯‚¸‚ê‚é + nItem += 1; // 削除ã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®æ¬¡ã®ã‚¢ã‚¤ãƒ†ãƒ  + nItem -= nDelItemCount; // æ–°ã—ã„ä½ç½®ã¯ã€å‰Šé™¤ã—ãŸåˆ†ã ã‘ãšã‚Œã‚‹ if( pRecent->GetItemCount() <= nItem ){ - // ‹Œƒf[ƒ^‚ÌÅŒã‚Ì—v‘f‚ªíœ‚³‚ê‚Ä‚¢‚é‚Æ‚«‚ÍA - // Vƒf[ƒ^‚ÌÅŒã‚ð‘I‘ð + // 旧データã®æœ€å¾Œã®è¦ç´ ãŒå‰Šé™¤ã•ã‚Œã¦ã„ã‚‹ã¨ãã¯ã€ + // 新データã®æœ€å¾Œã‚’é¸æŠž nItem = pRecent->GetItemCount() -1; } } int nLvTopIndex = ListView_GetTopIndex(hwndList); SetDataOne(m_nCurrentTab, nItem); if( 1 == nDelItemCount ){ - // 1‚Â휂̂Ƃ«‚ÍAYƒXƒNƒ[ƒ‹ˆÊ’u‚ð•ÛŽ - // 2‚ˆÈã‚Í•¡ŽG‚È‚Ì‚ÅSetDataOne‚É‚¨‚Ü‚©‚¹‚·‚é + // 1ã¤å‰Šé™¤ã®ã¨ãã¯ã€Yスクロールä½ç½®ã‚’ä¿æŒ + // 2ã¤ä»¥ä¸Šã¯è¤‡é›‘ãªã®ã§SetDataOneã«ãŠã¾ã‹ã›ã™ã‚‹ nLvTopIndex = t_max(0, t_min(pRecent->GetItemCount() - 1, nLvTopIndex)); int nNowLvTopIndex = ListView_GetTopIndex(hwndList); if( nNowLvTopIndex != nLvTopIndex ){ CMyRect rect; if( ListView_GetItemRect(hwndList, nNowLvTopIndex, &rect, LVIR_BOUNDS) ){ - // ListView_Scroll‚ÌYÀ•W‚Ípixel’PˆÊ‚ŃXƒNƒ[ƒ‹•Ï‰»•ª‚ðŽw’è + // ListView_Scrollã®Y座標ã¯pixelå˜ä½ã§ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«å¤‰åŒ–分を指定 ListView_Scroll(hwndList, 0, (nLvTopIndex - nNowLvTopIndex) * (rect.bottom - rect.top) ); } @@ -922,7 +922,7 @@ void CDlgFavorite::UpdateUIState() DlgItem_Enable( GetHwnd(), IDC_BUTTON_ADD_FAVORITE, m_aFavoriteInfo[m_nCurrentTab].m_bEditable && recent.GetItemCount() <= recent.GetArrayCount() ); - // 휂̗LŒøE–³Œø‰» + // 削除ã®æœ‰åŠ¹ãƒ»ç„¡åŠ¹åŒ– DlgItem_Enable( GetHwnd(), IDC_BUTTON_CLEAR, 0 < recent.GetItemCount() ); @@ -1027,15 +1027,15 @@ void CDlgFavorite::RightMenu(POINT &menuPos) nEnable = (0 < recent.GetItemCount() ? 0 : MF_GRAYED); ::InsertMenu( hMenu, iPos++, MF_BYPOSITION | MF_STRING | nEnable, MENU_DELETE_SELECTED, LS( STR_DLGFAV_MENU_DEL_SEL ) ); - // ƒƒjƒ…[‚ð•\Ž¦‚·‚é + // メニューを表示ã™ã‚‹ POINT pt = menuPos; RECT rcWork; - GetMonitorWorkRect( pt, &rcWork ); // ƒ‚ƒjƒ^‚̃[ƒNƒGƒŠƒA + GetMonitorWorkRect( pt, &rcWork ); // モニタã®ãƒ¯ãƒ¼ã‚¯ã‚¨ãƒªã‚¢ int nId = ::TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON | TPM_RETURNCMD, ( pt.x > rcWork.left )? pt.x: rcWork.left, ( pt.y < rcWork.bottom )? pt.y: rcWork.bottom, 0, GetHwnd(), NULL); - ::DestroyMenu( hMenu ); // ƒTƒuƒƒjƒ…[‚ÍÄ‹A“I‚É”jŠü‚³‚ê‚é + ::DestroyMenu( hMenu ); // サブメニューã¯å†å¸°çš„ã«ç ´æ£„ã•ã‚Œã‚‹ switch( nId ){ case MENU_EDIT: @@ -1061,7 +1061,7 @@ void CDlgFavorite::RightMenu(POINT &menuPos) } } if( bAddFalse ){ - WarningMessage(GetHwnd(), LS( STR_DLGFAV_LIST_LIMIT_OVER ) ); // "œŠOƒŠƒXƒg‚ª‚¢‚Á‚Ï‚¢‚ŒljÁ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B" + WarningMessage(GetHwnd(), LS( STR_DLGFAV_LIST_LIMIT_OVER ) ); // "除外リストãŒã„ã£ã±ã„ã§è¿½åŠ ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" } SetDataOne(m_nExceptTab, -1); UpdateUIState(); @@ -1089,7 +1089,7 @@ void CDlgFavorite::RightMenu(POINT &menuPos) int FormatFavoriteColumn(TCHAR* buf, int size, int index, bool view) { - // 2010.03.21 Moca Text‚ɘA”Ô‚ðÝ’è‚·‚邱‚Æ‚É‚æ‚Á‚ăAƒNƒZƒXƒL[‚É‚·‚é + // 2010.03.21 Moca Textã«é€£ç•ªã‚’設定ã™ã‚‹ã“ã¨ã«ã‚ˆã£ã¦ã‚¢ã‚¯ã‚»ã‚¹ã‚­ãƒ¼ã«ã™ã‚‹ // 0 - 9 A - Z const int mod = index % 36; const TCHAR c = (TCHAR)(((mod) <= 9)?(_T('0') + mod):(_T('A') + mod - 10)); @@ -1098,7 +1098,7 @@ int FormatFavoriteColumn(TCHAR* buf, int size, int index, bool view) /*! - ListView‚ÌItem(index)‚©‚çLParam‚ðintŒ^‚Æ‚µ‚Ď擾 + ListViewã®Item(index)ã‹ã‚‰LParamã‚’intåž‹ã¨ã—ã¦å–å¾— */ static int ListView_GetLParamInt( HWND hwndList, int lvIndex ) { @@ -1115,34 +1115,34 @@ static int ListView_GetLParamInt( HWND hwndList, int lvIndex ) /*! - @param info [in,out] ƒŠƒXƒgƒrƒ…[‚̃\[ƒgó‘Ôî•ñ - @param pRecent ƒ\[ƒgƒAƒCƒeƒ€ - @param column ƒ\[ƒg‚µ‚½‚¢—ñ”Ô† - @param bReverse ƒ\[ƒgÏ‚Ý‚ÌꇂÉ~‡‚ÉØ‚è‘Ö‚¦‚é + @param info [in,out] リストビューã®ã‚½ãƒ¼ãƒˆçŠ¶æ…‹æƒ…å ± + @param pRecent ソートアイテム + @param column ソートã—ãŸã„åˆ—ç•ªå· + @param bReverse ソート済ã¿ã®å ´åˆã«é™é †ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ */ // static void CDlgFavorite::ListViewSort(ListViewSortInfo& info, const CRecent* pRecent, int column, bool bReverse ) { CompareListViewLParam lparamInfo; - // ƒ\[ƒg‡‚ÌŒˆ’è + // ソート順ã®æ±ºå®š if( info.nSortColumn != column ){ info.bSortAscending = true; }else{ - // ƒ\[ƒg‹t‡(~‡) + // ソート逆順(é™é †) info.bSortAscending = (bReverse ? (!info.bSortAscending): true); } - // ƒwƒbƒ_‘‚«Š·‚¦ + // ヘッダ書ãæ›ãˆ TCHAR szHeader[200]; LV_COLUMN col; if( -1 != info.nSortColumn ){ - // Œ³‚̃\[ƒg‚Ìu ¥v‚ðŽæ‚蜂­ + // å…ƒã®ã‚½ãƒ¼ãƒˆã®ã€Œ â–¼ã€ã‚’å–り除ã col.mask = LVCF_TEXT; col.pszText = szHeader; col.cchTextMax = _countof(szHeader); col.iSubItem = 0; ListView_GetColumn( info.hListView, info.nSortColumn, &col ); - int nLen = (int)_tcslen(szHeader) - _tcslen(_T("¥")); + int nLen = (int)_tcslen(szHeader) - _tcslen(_T("â–¼")); if( 0 <= nLen ){ szHeader[nLen] = _T('\0'); } @@ -1151,13 +1151,13 @@ void CDlgFavorite::ListViewSort(ListViewSortInfo& info, const CRecent* pRecent, col.iSubItem = 0; ListView_SetColumn( info.hListView, info.nSortColumn, &col ); } - // u¥v‚ð•t‰Á + // 「▼ã€ã‚’付加 col.mask = LVCF_TEXT; col.pszText = szHeader; col.cchTextMax = _countof(szHeader) - 4; col.iSubItem = 0; ListView_GetColumn( info.hListView, column, &col ); - _tcscat(szHeader, info.bSortAscending ? _T("¥") : _T("£")); + _tcscat(szHeader, info.bSortAscending ? _T("â–¼") : _T("â–²")); col.mask = LVCF_TEXT; col.pszText = szHeader; col.iSubItem = 0; @@ -1200,7 +1200,7 @@ INT_PTR CDlgFavorite::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM BOOL CDlgFavorite::OnSize( WPARAM wParam, LPARAM lParam ) { - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ CDialog::OnSize( wParam, lParam ); ::GetWindowRect( GetHwnd(), &GetDllShareData().m_Common.m_sOthers.m_rcFavoriteDialog ); diff --git a/sakura_core/dlg/CDlgFavorite.h b/sakura_core/dlg/CDlgFavorite.h index 27aef90afc..5c358eeb8b 100644 --- a/sakura_core/dlg/CDlgFavorite.h +++ b/sakura_core/dlg/CDlgFavorite.h @@ -1,5 +1,5 @@ -/*! @file - @brief —š—ð‚ÌŠÇ—ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 履歴ã®ç®¡ç†ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author MIK @date 2003.4.8 @@ -37,8 +37,8 @@ #include "dlg/CDialog.h" #include "recent/CRecent.h" -//!u—š—ð‚Æ‚¨‹C‚É“ü‚è‚ÌŠÇ—vƒ_ƒCƒAƒƒO -//ƒAƒNƒZƒX•û–@F[Ý’è] - [—š—ð‚ÌŠÇ—] +//!「履歴ã¨ãŠæ°—ã«å…¥ã‚Šã®ç®¡ç†ã€ãƒ€ã‚¤ã‚¢ãƒ­ã‚° +//アクセス方法：[設定] - [履歴ã®ç®¡ç†] class CDlgFavorite : public CDialog { public: @@ -51,28 +51,28 @@ class CDlgFavorite : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ); BOOL OnBnClicked( int ); BOOL OnNotify( WPARAM wParam, LPARAM lParam ); BOOL OnActivate( WPARAM wParam, LPARAM lParam ); LPVOID GetHelpIdTable( void ); - INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // •W€ˆÈŠO‚̃ƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); // 標準以外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ•æ‰ã™ã‚‹ BOOL OnSize( WPARAM wParam, LPARAM lParam ); BOOL OnMove( WPARAM wParam, LPARAM lParam ); BOOL OnMinMaxInfo( LPARAM lParam ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ void TabSelectChange( bool ); bool RefreshList( void ); - void SetDataOne( int nIndex, int nLvItemIndex ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + void SetDataOne( int nIndex, int nLvItemIndex ); /* ダイアログデータã®è¨­å®š */ bool RefreshListOne( int nIndex ); //void ChangeSlider( int nIndex ); void UpdateUIState(); @@ -95,21 +95,21 @@ class CDlgFavorite : public CDialog CRecentCurDir m_cRecentCurDir; enum { - // ! ŠÇ—” - FAVORITE_INFO_MAX = 10 // ŠÇ—” +1(”Ô•º) + // ! 管ç†æ•° + FAVORITE_INFO_MAX = 10 // 管ç†æ•° +1(番兵) }; struct FavoriteInfo { - CRecent* m_pRecent; //ƒIƒuƒWƒFƒNƒg‚ւ̃|ƒCƒ“ƒ^ - std::tstring m_strCaption; //ƒLƒƒƒvƒVƒ‡ƒ“ - const TCHAR* m_pszCaption; //ƒLƒƒƒvƒVƒ‡ƒ“ - int m_nId; //ƒRƒ“ƒgƒ[ƒ‹‚ÌID - bool m_bHaveFavorite; //‚¨‹C‚É“ü‚è‚ðŽ‚Á‚Ä‚¢‚é‚©H - bool m_bHaveView; //•\Ž¦”•ÏX‹@”\‚ð‚à‚Á‚Ä‚¢‚é‚©H - bool m_bFilePath; //ƒtƒ@ƒCƒ‹/ƒtƒHƒ‹ƒ_‚©H - bool m_bEditable; //•ÒW‰Â”\ - bool m_bAddExcept; //œŠO‚֒ljÁ - int m_nViewCount; //ƒJƒŒƒ“ƒg‚Ì•\Ž¦” + CRecent* m_pRecent; //オブジェクトã¸ã®ãƒã‚¤ãƒ³ã‚¿ + std::tstring m_strCaption; //キャプション + const TCHAR* m_pszCaption; //キャプション + int m_nId; //コントロールã®ID + bool m_bHaveFavorite; //ãŠæ°—ã«å…¥ã‚Šã‚’æŒã£ã¦ã„ã‚‹ã‹ï¼Ÿ + bool m_bHaveView; //表示数変更機能をもã£ã¦ã„ã‚‹ã‹ï¼Ÿ + bool m_bFilePath; //ファイル/フォルダã‹ï¼Ÿ + bool m_bEditable; //編集å¯èƒ½ + bool m_bAddExcept; //除外ã¸è¿½åŠ  + int m_nViewCount; //カレントã®è¡¨ç¤ºæ•° FavoriteInfo(): m_pRecent(NULL) ,m_pszCaption(NULL) @@ -123,9 +123,9 @@ class CDlgFavorite : public CDialog {}; }; struct ListViewSortInfo { - HWND hListView; //!< ƒŠƒXƒgƒrƒ…[‚Ì HWND - int nSortColumn; //!< ƒ\[ƒg—ñ -1‚Å–¢Žw’è - bool bSortAscending; //!< ƒ\[ƒg‚ª¸‡ + HWND hListView; //!< リストビュー㮠HWND + int nSortColumn; //!< ソート列 -1ã§æœªæŒ‡å®š + bool bSortAscending; //!< ソートãŒæ˜‡é † }; FavoriteInfo m_aFavoriteInfo[FAVORITE_INFO_MAX]; diff --git a/sakura_core/dlg/CDlgFileUpdateQuery.cpp b/sakura_core/dlg/CDlgFileUpdateQuery.cpp index 2d6f550aec..1bd773fcd5 100644 --- a/sakura_core/dlg/CDlgFileUpdateQuery.cpp +++ b/sakura_core/dlg/CDlgFileUpdateQuery.cpp @@ -1,7 +1,7 @@ -/*! @file - @brief XV’Ê’m‹y‚ÑŠm”Fƒ_ƒCƒAƒƒO +/*! @file + @brief 更新通知åŠã³ç¢ºèªãƒ€ã‚¤ã‚¢ãƒ­ã‚° - ƒtƒ@ƒCƒ‹‚ÌXV’Ê’m‚Æ“®ì‚ÌŠm”F‚ðs‚¤ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + ファイルã®æ›´æ–°é€šçŸ¥ã¨å‹•ä½œã®ç¢ºèªã‚’è¡Œã†ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author genta @date 2002.12.04 @@ -44,26 +44,26 @@ BOOL CDlgFileUpdateQuery::OnInitDialog( HWND hWnd, WPARAM wParam, LPARAM lParam } /*! - ƒ{ƒ^ƒ“‚ª‰Ÿ‚³‚ꂽ‚Æ‚«‚Ì“®ì + ボタンãŒæŠ¼ã•ã‚ŒãŸã¨ãã®å‹•ä½œ */ BOOL CDlgFileUpdateQuery::OnBnClicked(int id) { EFileUpdateQuery result; switch( id ){ - case IDC_BTN_RELOAD: // Ä“Çž + case IDC_BTN_RELOAD: // å†èª­è¾¼ result = EFUQ_RELOAD; break; - case IDC_BTN_CLOSE: // •Â‚¶‚é + case IDC_BTN_CLOSE: // é–‰ã˜ã‚‹ result = EFUQ_CLOSE; break; - case IDC_BTN_NOTIFYONLY: // ˆÈŒã’Ê’mƒƒbƒZ[ƒW‚Ì‚Ý + case IDC_BTN_NOTIFYONLY: // 以後通知メッセージã®ã¿ result = EFUQ_NOTIFYONLY; break; - case IDC_BTN_NOSUPERVISION: // ˆÈŒãXV‚ðŠÄŽ‹‚µ‚È‚¢ + case IDC_BTN_NOSUPERVISION: // 以後更新を監視ã—ãªã„ result = EFUQ_NOSUPERVISION; break; - case IDC_BTN_AUTOLOAD: // ˆÈŒã–¢•ÒW‚Åă[ƒh + case IDC_BTN_AUTOLOAD: // 以後未編集ã§å†ãƒ­ãƒ¼ãƒ‰ result = EFUQ_AUTOLOAD; break; default: diff --git a/sakura_core/dlg/CDlgFileUpdateQuery.h b/sakura_core/dlg/CDlgFileUpdateQuery.h index ba868a0d3f..9d7b8a69d6 100644 --- a/sakura_core/dlg/CDlgFileUpdateQuery.h +++ b/sakura_core/dlg/CDlgFileUpdateQuery.h @@ -1,7 +1,7 @@ -/*! @file - @brief XV’Ê’m‹y‚ÑŠm”Fƒ_ƒCƒAƒƒO +/*! @file + @brief 更新通知åŠã³ç¢ºèªãƒ€ã‚¤ã‚¢ãƒ­ã‚° - ƒtƒ@ƒCƒ‹‚ÌXV’Ê’m‚Æ“®ì‚ÌŠm”F‚ðs‚¤ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + ファイルã®æ›´æ–°é€šçŸ¥ã¨å‹•ä½œã®ç¢ºèªã‚’è¡Œã†ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author genta @date 2002.12.04 @@ -35,11 +35,11 @@ #include "dlg/CDialog.h" enum EFileUpdateQuery { - EFUQ_CLOSE = 0, //!< •Â‚¶‚é - EFUQ_RELOAD = 1, //!< Ä“Çž - EFUQ_NOTIFYONLY = 2, //!< ˆÈŒã’Ê’mƒƒbƒZ[ƒW‚Ì‚Ý - EFUQ_NOSUPERVISION = 3, //!< ˆÈŒãXV‚ðŠÄŽ‹‚µ‚È‚¢ - EFUQ_AUTOLOAD = 4 //!< ˆÈŒã–¢•ÒW‚Åă[ƒh + EFUQ_CLOSE = 0, //!< é–‰ã˜ã‚‹ + EFUQ_RELOAD = 1, //!< å†èª­è¾¼ + EFUQ_NOTIFYONLY = 2, //!< 以後通知メッセージã®ã¿ + EFUQ_NOSUPERVISION = 3, //!< 以後更新を監視ã—ãªã„ + EFUQ_AUTOLOAD = 4 //!< 以後未編集ã§å†ãƒ­ãƒ¼ãƒ‰ }; class CDlgFileUpdateQuery : public CDialog { diff --git a/sakura_core/dlg/CDlgFind.cpp b/sakura_core/dlg/CDlgFind.cpp index 519ffa2672..ca61fbb09c 100644 --- a/sakura_core/dlg/CDlgFind.cpp +++ b/sakura_core/dlg/CDlgFind.cpp @@ -1,9 +1,9 @@ -/*! @file - @brief ŒŸõƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 検索ダイアログボックス @author Norio Nakatani - @date 1998/12/12 Äì¬ - @date 2001/06/23 N.Nakatani ’PŒê’PˆÊ‚ÅŒŸõ‚·‚é‹@”\‚ðŽÀ‘• + @date 1998/12/12 å†ä½œæˆ + @date 2001/06/23 N.Nakatani å˜èªžå˜ä½ã§æ¤œç´¢ã™ã‚‹æ©Ÿèƒ½ã‚’実装 */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -25,21 +25,21 @@ #include "sakura_rc.h" #include "sakura.hh" -//ŒŸõ CDlgFind.cpp //@@@ 2002.01.07 add start MIK +//検索 CDlgFind.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //11800 - IDC_BUTTON_SEARCHNEXT, HIDC_FIND_BUTTON_SEARCHNEXT, //ŽŸ‚ðŒŸõ - IDC_BUTTON_SEARCHPREV, HIDC_FIND_BUTTON_SEARCHPREV, //‘O‚ðŒŸõ - IDCANCEL, HIDCANCEL_FIND, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_FIND_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHK_WORD, HIDC_FIND_CHK_WORD, //’PŒê’PˆÊ - IDC_CHK_LOHICASE, HIDC_FIND_CHK_LOHICASE, //‘啶Žš¬•¶Žš - IDC_CHK_REGULAREXP, HIDC_FIND_CHK_REGULAREXP, //³‹K•\Œ» - IDC_CHECK_NOTIFYNOTFOUND, HIDC_FIND_CHECK_NOTIFYNOTFOUND, //Œ©‚‚©‚ç‚È‚¢‚Æ‚«‚É’Ê’m - IDC_CHECK_bAutoCloseDlgFind, HIDC_FIND_CHECK_bAutoCloseDlgFind, //Ž©“®“I‚ɕ‚¶‚é - IDC_COMBO_TEXT, HIDC_FIND_COMBO_TEXT, //ŒŸõ•¶Žš—ñ - IDC_STATIC_JRE32VER, HIDC_FIND_STATIC_JRE32VER, //³‹K•\Œ»ƒo[ƒWƒ‡ƒ“ - IDC_BUTTON_SETMARK, HIDC_FIND_BUTTON_SETMARK, //2002.01.16 hor ŒŸõŠY“–s‚ðƒ}[ƒN - IDC_CHECK_SEARCHALL, HIDC_FIND_CHECK_SEARCHALL, //2002.01.26 hor 擪i––”öj‚©‚çÄŒŸõ + IDC_BUTTON_SEARCHNEXT, HIDC_FIND_BUTTON_SEARCHNEXT, //次を検索 + IDC_BUTTON_SEARCHPREV, HIDC_FIND_BUTTON_SEARCHPREV, //å‰ã‚’検索 + IDCANCEL, HIDCANCEL_FIND, //キャンセル + IDC_BUTTON_HELP, HIDC_FIND_BUTTON_HELP, //ヘルプ + IDC_CHK_WORD, HIDC_FIND_CHK_WORD, //å˜èªžå˜ä½ + IDC_CHK_LOHICASE, HIDC_FIND_CHK_LOHICASE, //大文字å°æ–‡å­— + IDC_CHK_REGULAREXP, HIDC_FIND_CHK_REGULAREXP, //æ­£è¦è¡¨ç¾ + IDC_CHECK_NOTIFYNOTFOUND, HIDC_FIND_CHECK_NOTIFYNOTFOUND, //見ã¤ã‹ã‚‰ãªã„ã¨ãã«é€šçŸ¥ + IDC_CHECK_bAutoCloseDlgFind, HIDC_FIND_CHECK_bAutoCloseDlgFind, //自動的ã«é–‰ã˜ã‚‹ + IDC_COMBO_TEXT, HIDC_FIND_COMBO_TEXT, //検索文字列 + IDC_STATIC_JRE32VER, HIDC_FIND_STATIC_JRE32VER, //æ­£è¦è¡¨ç¾ãƒãƒ¼ã‚¸ãƒ§ãƒ³ + IDC_BUTTON_SETMARK, HIDC_FIND_BUTTON_SETMARK, //2002.01.16 hor 検索該当行をマーク + IDC_CHECK_SEARCHALL, HIDC_FIND_CHECK_SEARCHALL, //2002.01.26 hor 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK @@ -52,9 +52,9 @@ CDlgFind::CDlgFind() /*! - ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃hƒƒbƒvƒ_ƒEƒ“ƒƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + コンボボックスã®ãƒ‰ãƒ­ãƒƒãƒ—ダウンメッセージをæ•æ‰ã™ã‚‹ - @date 2013.03.24 novice V‹Kì¬ + @date 2013.03.24 novice æ–°è¦ä½œæˆ */ BOOL CDlgFind::OnCbnDropDown( HWND hwndCtl, int wID ) { @@ -71,17 +71,17 @@ BOOL CDlgFind::OnCbnDropDown( HWND hwndCtl, int wID ) return CDialog::OnCbnDropDown( hwndCtl, wID ); } -/* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モードレスダイアログã®è¡¨ç¤º */ HWND CDlgFind::DoModeless( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam ) { - m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_bNOTIFYNOTFOUND = m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND; // ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ - m_ptEscCaretPos_PHY = ((CEditView*)lParam)->GetCaret().GetCaretLogicPos(); // ŒŸõŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u‘Þ”ð - ((CEditView*)lParam)->m_bSearch = TRUE; // ŒŸõŠJŽnˆÊ’u‚Ì“o˜^—L–³ 02/07/28 ai + m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // 検索オプション + m_bNOTIFYNOTFOUND = m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND; // 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 + m_ptEscCaretPos_PHY = ((CEditView*)lParam)->GetCaret().GetCaretLogicPos(); // 検索開始時ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®é€€é¿ + ((CEditView*)lParam)->m_bSearch = TRUE; // 検索開始ä½ç½®ã®ç™»éŒ²æœ‰ç„¡ 02/07/28 ai return CDialog::DoModeless( hInstance, hwndParent, IDD_FIND, lParam, SW_SHOW ); } -/* ƒ‚[ƒhƒŒƒXŽžFŒŸõ‘ÎÛ‚Æ‚È‚éƒrƒ…[‚Ì•ÏX */ +/* モードレス時：検索対象ã¨ãªã‚‹ãƒ“ューã®å¤‰æ›´ */ void CDlgFind::ChangeView( LPARAM pcEditView ) { m_lParam = pcEditView; @@ -97,7 +97,7 @@ BOOL CDlgFind::OnInitDialog( HWND hwnd, WPARAM wParam, LPARAM lParam ) m_comboDel.pRecent = &m_cRecentSearch; SetComboBoxDeleter(GetItemHwnd(IDC_COMBO_TEXT), &m_comboDel); - // ƒtƒHƒ“ƒgÝ’è 2012/11/27 Uchi + // フォント設定 2012/11/27 Uchi HFONT hFontOld = (HFONT)::SendMessageAny( GetItemHwnd( IDC_COMBO_TEXT ), WM_GETFONT, 0, 0 ); HFONT hFont = SetMainFont( GetItemHwnd( IDC_COMBO_TEXT ) ); m_cFontText.SetFont( hFontOld, hFont, GetItemHwnd( IDC_COMBO_TEXT ) ); @@ -114,55 +114,55 @@ BOOL CDlgFind::OnDestroy() -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgFind::SetData( void ) { // MYTRACE( _T("CDlgFind::SetData()") ); /***************************** - * ‰Šú‰» * + * åˆæœŸåŒ– * *****************************/ // Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ‚É‚æ‚èjre.dll”»’è‚ðíœ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã—ã«ã‚ˆã‚Šjre.dll判定を削除 - /* ƒ†[ƒU[‚ªƒRƒ“ƒ{ ƒ{ƒbƒNƒX‚̃GƒfƒBƒbƒg ƒRƒ“ƒgƒ[ƒ‹‚É“ü—Í‚Å‚«‚éƒeƒLƒXƒg‚Ì’·‚³‚ð§ŒÀ‚·‚é */ - // 2011.12.18 ’·‚³§ŒÀ“P”p + /* ユーザーãŒã‚³ãƒ³ãƒœ ボックスã®ã‚¨ãƒ‡ã‚£ãƒƒãƒˆ コントロールã«å…¥åŠ›ã§ãるテキストã®é•·ã•ã‚’制é™ã™ã‚‹ */ + // 2011.12.18 é•·ã•åˆ¶é™æ’¤å»ƒ // Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), _MAX_PATH - 1 ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), TRUE ); /***************************** - * ƒf[ƒ^Ý’è * + * データ設定 * *****************************/ - /* ŒŸõ•¶Žš—ñ */ - // ŒŸõ•¶Žš—ñƒŠƒXƒg‚ÌÝ’è(ŠÖ”‰») 2010/5/28 Uchi + /* 検索文字列 */ + // 検索文字列リストã®è¨­å®š(関数化) 2010/5/28 Uchi SetCombosList(); - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, m_sSearchOption.bLoHiCase ); // 2001/06/23 Norio Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_WORD, m_sSearchOption.bWordOnly ); - /* ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND, m_bNOTIFYNOTFOUND ); // From Here Jun. 29, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ - // ˆ—ƒtƒ[‹y‚Ñ”»’èðŒ‚ÌŒ©’¼‚µB•K‚¸³‹K•\Œ»‚̃`ƒFƒbƒN‚Æ - // –³ŠÖŒW‚ÉCheckRegexpVersion‚ð’ʉ߂·‚é‚悤‚É‚µ‚½B + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— + // 処ç†ãƒ•ãƒ­ãƒ¼åŠã³åˆ¤å®šæ¡ä»¶ã®è¦‹ç›´ã—。必ãšæ­£è¦è¡¨ç¾ã®ãƒã‚§ãƒƒã‚¯ã¨ + // 無関係ã«CheckRegexpVersionを通éŽã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚ if( CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, false ) && m_sSearchOption.bRegularExp){ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 1 ); -//³‹K•\Œ»‚ªON‚Å‚àA‘啶Žš¬•¶Žš‚ð‹æ•Ê‚·‚é^‚µ‚È‚¢‚ð‘I‘ð‚Å‚«‚é‚悤‚ÉB +//æ­£è¦è¡¨ç¾ãŒONã§ã‚‚ã€å¤§æ–‡å­—å°æ–‡å­—を区別ã™ã‚‹ï¼ã—ãªã„ã‚’é¸æŠžã§ãるよã†ã«ã€‚ // ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 1 ); // ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), FALSE ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); } else { @@ -170,23 +170,23 @@ void CDlgFind::SetData( void ) } // To Here Jun. 29, 2001 genta - /* ŒŸõƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* 検索ダイアログを自動的ã«é–‰ã˜ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_bAutoCloseDlgFind, m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgFind ); - /* 擪i––”öj‚©‚çÄŒŸõ 2002.01.26 hor */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ 2002.01.26 hor */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_SEARCHALL, m_pShareData->m_Common.m_sSearch.m_bSearchAll ); return; } -// ŒŸõ•¶Žš—ñƒŠƒXƒg‚ÌÝ’è +// 検索文字列リストã®è¨­å®š // 2010/5/28 Uchi void CDlgFind::SetCombosList( void ) { HWND hwndCombo; - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ hwndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ); while (Combo_GetCount(hwndCombo) > 0) { Combo_DeleteString( hwndCombo, 0); @@ -200,55 +200,55 @@ void CDlgFind::SetCombosList( void ) } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +/* ダイアログデータã®å–å¾— */ int CDlgFind::GetData( void ) { // MYTRACE( _T("CDlgFind::GetData()") ); - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ m_sSearchOption.bLoHiCase = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_LOHICASE )); // 2001/06/23 Norio Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ m_sSearchOption.bWordOnly = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_WORD )); - /* ˆê’v‚·‚é’PŒê‚Ì‚ÝŒŸõ‚·‚é */ - /* ³‹K•\Œ» */ + /* 一致ã™ã‚‹å˜èªžã®ã¿æ¤œç´¢ã™ã‚‹ */ + /* æ­£è¦è¡¨ç¾ */ m_sSearchOption.bRegularExp = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP )); - /* ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ m_bNOTIFYNOTFOUND = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND ); - m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = m_bNOTIFYNOTFOUND; // ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ + m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = m_bNOTIFYNOTFOUND; // 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ int nBufferSize = ::GetWindowTextLength( GetItemHwnd(IDC_COMBO_TEXT) ) + 1; std::vector vText(nBufferSize); ::DlgItem_GetText( GetHwnd(), IDC_COMBO_TEXT, &vText[0], nBufferSize); m_strText = to_wchar(&vText[0]); - /* ŒŸõƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* 検索ダイアログを自動的ã«é–‰ã˜ã‚‹ */ m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgFind = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_bAutoCloseDlgFind ); - /* 擪i––”öj‚©‚çÄŒŸõ 2002.01.26 hor */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ 2002.01.26 hor */ m_pShareData->m_Common.m_sSearch.m_bSearchAll = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SEARCHALL ); if( 0 < m_strText.length() ){ - /* ³‹K•\Œ»H */ + /* æ­£è¦è¡¨ç¾ï¼Ÿ */ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— int nFlag = 0x00; nFlag |= m_sSearchOption.bLoHiCase ? 0x01 : 0x00; if( m_sSearchOption.bRegularExp && !CheckRegexpSyntax( m_strText.c_str(), GetHwnd(), true, nFlag ) ){ return -1; } - // To Here Jun. 26, 2001 genta ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ·‚µ‘Ö‚¦ + // To Here Jun. 26, 2001 genta æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリ差ã—替㈠- /* ŒŸõ•¶Žš—ñ */ - //@@@ 2002.2.2 YAZAKI CShareData‚Ɉړ® + /* 検索文字列 */ + //@@@ 2002.2.2 YAZAKI CShareDataã«ç§»å‹• if( m_strText.size() < _MAX_PATH ){ CSearchKeywordManager().AddToSearchKeyArr( m_strText.c_str() ); - m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ + m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // 検索オプション } CEditView* pcEditView = (CEditView*)m_lParam; if( pcEditView->m_strCurSearchKey == m_strText && pcEditView->m_sCurSearchOption == m_sSearchOption ){ @@ -259,9 +259,9 @@ int CDlgFind::GetData( void ) } pcEditView->m_nCurSearchKeySequence = GetDllShareData().m_Common.m_sSearch.m_nSearchKeySequence; if( !m_bModal ){ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + /* ダイアログデータã®è¨­å®š */ //SetData(); - SetCombosList(); // ƒRƒ“ƒ{‚݂̂̉Šú‰» 2010/5/28 Uchi + SetCombosList(); // コンボã®ã¿ã®åˆæœŸåŒ– 2010/5/28 Uchi } return 1; }else{ @@ -277,113 +277,113 @@ BOOL CDlgFind::OnBnClicked( int wID ) CEditView* pcEditView = (CEditView*)m_lParam; switch( wID ){ case IDC_BUTTON_HELP: - /* uŒŸõv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_SEARCH_DIALOG) ); //Apr. 5, 2001 JEPRO C³˜R‚ê‚ð’ljÁ // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「検索ã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_SEARCH_DIALOG) ); //Apr. 5, 2001 JEPRO 修正æ¼ã‚Œã‚’追加 // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ break; - case IDC_CHK_REGULAREXP: /* ³‹K•\Œ» */ + case IDC_CHK_REGULAREXP: /* æ­£è¦è¡¨ç¾ */ // MYTRACE( _T("IDC_CHK_REGULAREXP ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) = %d\n"), ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ); if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ){ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— if( !CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, true ) ){ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 0 ); }else{ // To Here Jun. 26, 2001 genta - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ // Jan. 31, 2002 genta - // ‘啶ŽšE¬•¶Žš‚Ì‹æ•Ê‚ͳ‹K•\Œ»‚ÌÝ’è‚ÉŠÖ‚í‚炸•Û‘¶‚·‚é + // 大文字・å°æ–‡å­—ã®åŒºåˆ¥ã¯æ­£è¦è¡¨ç¾ã®è¨­å®šã«é–¢ã‚らãšä¿å­˜ã™ã‚‹ //::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 1 ); //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), FALSE ); // 2001/06/23 Norio Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); } }else{ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), TRUE ); // Jan. 31, 2002 genta - // ‘啶ŽšE¬•¶Žš‚Ì‹æ•Ê‚ͳ‹K•\Œ»‚ÌÝ’è‚ÉŠÖ‚í‚炸•Û‘¶‚·‚é + // 大文字・å°æ–‡å­—ã®åŒºåˆ¥ã¯æ­£è¦è¡¨ç¾ã®è¨­å®šã«é–¢ã‚らãšä¿å­˜ã™ã‚‹ //::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 0 ); // 2001/06/23 Norio Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), TRUE ); } break; - case IDC_BUTTON_SEARCHPREV: /* ㌟õ */ //Feb. 13, 2001 JEPRO ƒ{ƒ^ƒ“–¼‚ð[IDC_BUTTON1]¨[IDC_BUTTON_SERACHPREV]‚É•ÏX - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDC_BUTTON_SEARCHPREV: /* 上検索 */ //Feb. 13, 2001 JEPRO ボタンåã‚’[IDC_BUTTON1]→[IDC_BUTTON_SERACHPREV]ã«å¤‰æ›´ + /* ダイアログデータã®å–å¾— */ nRet = GetData(); if( 0 < nRet ){ - if( m_bModal ){ /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚© */ + if( m_bModal ){ /* モーダルダイアログ㋠*/ CloseDialog( 1 ); }else{ - /* ‘O‚ðŒŸõ */ + /* å‰ã‚’検索 */ pcEditView->GetCommander().HandleCommand( F_SEARCH_PREV, true, (LPARAM)GetHwnd(), 0, 0, 0 ); - /* Ä•`‰æ 2005.04.06 zenryaku 0•¶Žš•ƒ}ƒbƒ`‚ŃLƒƒƒŒƒbƒg‚ð•\Ž¦‚·‚邽‚ß */ - pcEditView->Redraw(); // ‘O‰ñ0•¶Žš•ƒ}ƒbƒ`‚ÌÁ‹Ž‚É‚à•K—v + /* å†æç”» 2005.04.06 zenryaku 0文字幅マッãƒã§ã‚­ãƒ£ãƒ¬ãƒƒãƒˆã‚’表示ã™ã‚‹ãŸã‚ */ + pcEditView->Redraw(); // å‰å›ž0文字幅マッãƒã®æ¶ˆåŽ»ã«ã‚‚å¿…è¦ // 02/06/26 ai Start - // ŒŸõŠJŽnˆÊ’u‚ð“o˜^ + // 検索開始ä½ç½®ã‚’登録 if( FALSE != pcEditView->m_bSearch ){ - // ŒŸõŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u“o˜^ðŒ•ÏX 02/07/28 ai start + // 検索開始時ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®ç™»éŒ²æ¡ä»¶å¤‰æ›´ 02/07/28 ai start pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; // 02/07/28 ai end }// 02/06/26 ai End - /* ŒŸõƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* 検索ダイアログを自動的ã«é–‰ã˜ã‚‹ */ if( m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgFind ){ CloseDialog( 0 ); } } } else if (nRet == 0){ - OkMessage( GetHwnd(), LS(STR_DLGFIND1) ); // ŒŸõðŒ‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B + OkMessage( GetHwnd(), LS(STR_DLGFIND1) ); // 検索æ¡ä»¶ã‚’指定ã—ã¦ãã ã•ã„。 } return TRUE; - case IDC_BUTTON_SEARCHNEXT: /* ‰ºŒŸõ */ //Feb. 13, 2001 JEPRO ƒ{ƒ^ƒ“–¼‚ð[IDOK]¨[IDC_BUTTON_SERACHNEXT]‚É•ÏX - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDC_BUTTON_SEARCHNEXT: /* 下検索 */ //Feb. 13, 2001 JEPRO ボタンåã‚’[IDOK]→[IDC_BUTTON_SERACHNEXT]ã«å¤‰æ›´ + /* ダイアログデータã®å–å¾— */ nRet = GetData(); if( 0 < nRet ){ - if( m_bModal ){ /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚© */ + if( m_bModal ){ /* モーダルダイアログ㋠*/ CloseDialog( 2 ); } else{ - /* ŽŸ‚ðŒŸõ */ + /* 次を検索 */ pcEditView->GetCommander().HandleCommand( F_SEARCH_NEXT, true, (LPARAM)GetHwnd(), 0, 0, 0 ); - /* Ä•`‰æ 2005.04.06 zenryaku 0•¶Žš•ƒ}ƒbƒ`‚ŃLƒƒƒŒƒbƒg‚ð•\Ž¦‚·‚邽‚ß */ - pcEditView->Redraw(); // ‘O‰ñ0•¶Žš•ƒ}ƒbƒ`‚ÌÁ‹Ž‚É‚à•K—v + /* å†æç”» 2005.04.06 zenryaku 0文字幅マッãƒã§ã‚­ãƒ£ãƒ¬ãƒƒãƒˆã‚’表示ã™ã‚‹ãŸã‚ */ + pcEditView->Redraw(); // å‰å›ž0文字幅マッãƒã®æ¶ˆåŽ»ã«ã‚‚å¿…è¦ - // ŒŸõŠJŽnˆÊ’u‚ð“o˜^ + // 検索開始ä½ç½®ã‚’登録 if( FALSE != pcEditView->m_bSearch ){ - // ŒŸõŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u“o˜^ðŒ•ÏX 02/07/28 ai start + // 検索開始時ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®ç™»éŒ²æ¡ä»¶å¤‰æ›´ 02/07/28 ai start pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; } - /* ŒŸõƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* 検索ダイアログを自動的ã«é–‰ã˜ã‚‹ */ if( m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgFind ){ CloseDialog( 0 ); } } } else if (nRet == 0){ - OkMessage( GetHwnd(), LS(STR_DLGFIND1) ); // ŒŸõðŒ‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B + OkMessage( GetHwnd(), LS(STR_DLGFIND1) ); // 検索æ¡ä»¶ã‚’指定ã—ã¦ãã ã•ã„。 } return TRUE; - case IDC_BUTTON_SETMARK: //2002.01.16 hor ŠY“–sƒ}[ƒN + case IDC_BUTTON_SETMARK: //2002.01.16 hor 該当行マーク if( 0 < GetData() ){ - if( m_bModal ){ /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚© */ + if( m_bModal ){ /* モーダルダイアログ㋠*/ CloseDialog( 2 ); }else{ pcEditView->GetCommander().HandleCommand( F_BOOKMARK_PATTERN, false, 0, 0, 0, 0 ); - /* ŒŸõƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* 検索ダイアログを自動的ã«é–‰ã˜ã‚‹ */ if( m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgFind ){ CloseDialog( 0 ); } @@ -402,11 +402,11 @@ BOOL CDlgFind::OnBnClicked( int wID ) BOOL CDlgFind::OnActivate( WPARAM wParam, LPARAM lParam ) { - // 0•¶Žš•ƒ}ƒbƒ`•`‰æ‚ÌON/OFF // 2009.11.29 ryoji + // 0文字幅マッãƒæç”»ã®ON/OFF // 2009.11.29 ryoji CEditView* pcEditView = (CEditView*)m_lParam; CLayoutRange cRangeSel = pcEditView->GetSelectionInfo().m_sSelect; if( cRangeSel.IsValid() && cRangeSel.IsLineOne() && cRangeSel.IsOne() ) - pcEditView->InvalidateRect(NULL); // ƒAƒNƒeƒBƒu‰»^”ñƒAƒNƒeƒBƒu‰»‚ªŠ®—¹‚µ‚Ä‚©‚çÄ•`‰æ + pcEditView->InvalidateRect(NULL); // アクティブ化ï¼éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ãŒå®Œäº†ã—ã¦ã‹ã‚‰å†æç”» return CDialog::OnActivate(wParam, lParam); } diff --git a/sakura_core/dlg/CDlgFind.h b/sakura_core/dlg/CDlgFind.h index 2304ae9b48..968db5dfaf 100644 --- a/sakura_core/dlg/CDlgFind.h +++ b/sakura_core/dlg/CDlgFind.h @@ -1,8 +1,8 @@ -/*! @file - @brief ŒŸõƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 検索ダイアログボックス @author Norio Nakatani - @date 1998/12/02 Äì¬ + @date 1998/12/02 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -20,7 +20,7 @@ /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ class CDlgFind : public CDialog { @@ -32,29 +32,29 @@ class CDlgFind : public CDialog /* || Attributes & Operations */ -// int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - HWND DoModeless( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +// int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ + HWND DoModeless( HINSTANCE, HWND, LPARAM ); /* モードレスダイアログã®è¡¨ç¤º */ void ChangeView( LPARAM ); - SSearchOption m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - int m_bNOTIFYNOTFOUND; // ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ - std::wstring m_strText; // ŒŸõ•¶Žš—ñ + SSearchOption m_sSearchOption; // 検索オプション + int m_bNOTIFYNOTFOUND; // 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 + std::wstring m_strText; // 検索文字列 - CLogicPoint m_ptEscCaretPos_PHY; // ŒŸõŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u‘Þ”ðƒGƒŠƒA + CLogicPoint m_ptEscCaretPos_PHY; // 検索開始時ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®é€€é¿ã‚¨ãƒªã‚¢ CRecentSearch m_cRecentSearch; SComboBoxItemDeleter m_comboDel; CFontAutoDeleter m_cFontText; protected: -//@@@ 2002.2.2 YAZAKI CShareData‚Ɉړ® +//@@@ 2002.2.2 YAZAKI CShareDataã«ç§»å‹• // void AddToSearchKeyArr( const char* ); - /* ƒI[ƒo[ƒ‰ƒCƒh? */ + /* オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰? */ BOOL OnCbnDropDown( HWND hwndCtl, int wID ); - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - void SetCombosList( void ); /* ŒŸõ•¶Žš—ñ/’uŠ·Œã•¶Žš—ñƒŠƒXƒg‚ÌÝ’è */ - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ + void SetCombosList( void ); /* 検索文字列/ç½®æ›å¾Œæ–‡å­—列リストã®è¨­å®š */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnDestroy(); BOOL OnBnClicked( int ); diff --git a/sakura_core/dlg/CDlgGrep.cpp b/sakura_core/dlg/CDlgGrep.cpp index 5c5f225bd1..cd576ac8ee 100644 --- a/sakura_core/dlg/CDlgGrep.cpp +++ b/sakura_core/dlg/CDlgGrep.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief GREPƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief GREPダイアログボックス @author Norio Nakatani */ @@ -33,32 +33,32 @@ //GREP CDlgGrep.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12000 - IDC_BUTTON_FOLDER, HIDC_GREP_BUTTON_FOLDER, //ƒtƒHƒ‹ƒ_ - IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_BUTTON_CURRENTFOLDER, //Œ»ƒtƒHƒ‹ƒ_ - IDOK, HIDOK_GREP, //ŒŸõ - IDCANCEL, HIDCANCEL_GREP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_GREP_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHK_WORD, HIDC_GREP_CHK_WORD, //’PŒê’PˆÊ - IDC_CHK_SUBFOLDER, HIDC_GREP_CHK_SUBFOLDER, //ƒTƒuƒtƒHƒ‹ƒ_‚àŒŸõ - IDC_CHK_FROMTHISTEXT, HIDC_GREP_CHK_FROMTHISTEXT, //‚±‚̃tƒ@ƒCƒ‹‚©‚ç - IDC_CHK_LOHICASE, HIDC_GREP_CHK_LOHICASE, //‘啶Žš¬•¶Žš - IDC_CHK_REGULAREXP, HIDC_GREP_CHK_REGULAREXP, //³‹K•\Œ» - IDC_COMBO_CHARSET, HIDC_GREP_COMBO_CHARSET, //•¶ŽšƒR[ƒhƒZƒbƒg - IDC_CHECK_CP, HIDC_GREP_CHECK_CP, //ƒR[ƒhƒy[ƒW - IDC_COMBO_TEXT, HIDC_GREP_COMBO_TEXT, //ðŒ - IDC_COMBO_FILE, HIDC_GREP_COMBO_FILE, //ƒtƒ@ƒCƒ‹ - IDC_COMBO_FOLDER, HIDC_GREP_COMBO_FOLDER, //ƒtƒHƒ‹ƒ_ - IDC_BUTTON_FOLDER_UP, HIDC_GREP_BUTTON_FOLDER_UP, //ã - IDC_RADIO_OUTPUTLINE, HIDC_GREP_RADIO_OUTPUTLINE, //Œ‹‰Êo—ÍFs’PˆÊ - IDC_RADIO_OUTPUTMARKED, HIDC_GREP_RADIO_OUTPUTMARKED, //Œ‹‰Êo—ÍFŠY“–•”•ª - IDC_RADIO_OUTPUTSTYLE1, HIDC_GREP_RADIO_OUTPUTSTYLE1, //Œ‹‰Êo—ÍŒ`Ž®Fƒm[ƒ}ƒ‹ - IDC_RADIO_OUTPUTSTYLE2, HIDC_GREP_RADIO_OUTPUTSTYLE2, //Œ‹‰Êo—ÍŒ`Ž®Fƒtƒ@ƒCƒ‹–ˆ - IDC_RADIO_OUTPUTSTYLE3, HIDC_RADIO_OUTPUTSTYLE3, //Œ‹‰Êo—ÍŒ`Ž®FŒ‹‰Ê‚Ì‚Ý - IDC_STATIC_JRE32VER, HIDC_GREP_STATIC_JRE32VER, //³‹K•\Œ»ƒo[ƒWƒ‡ƒ“ - IDC_CHK_DEFAULTFOLDER, HIDC_GREP_CHK_DEFAULTFOLDER, //ƒtƒHƒ‹ƒ_‚̉Šú’l‚ðƒJƒŒƒ“ƒgƒtƒHƒ‹ƒ_‚É‚·‚é - IDC_CHECK_FILE_ONLY, HIDC_CHECK_FILE_ONLY, //ƒtƒ@ƒCƒ‹–ˆÅ‰‚Ì‚ÝŒŸõ - IDC_CHECK_BASE_PATH, HIDC_CHECK_BASE_PATH, //ƒx[ƒXƒtƒHƒ‹ƒ_•\Ž¦ - IDC_CHECK_SEP_FOLDER, HIDC_CHECK_SEP_FOLDER, //ƒtƒHƒ‹ƒ_–ˆ‚É•\Ž¦ + 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_FROMTHISTEXT, HIDC_GREP_CHK_FROMTHISTEXT, //ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ + IDC_CHK_LOHICASE, HIDC_GREP_CHK_LOHICASE, //大文字å°æ–‡å­— + IDC_CHK_REGULAREXP, HIDC_GREP_CHK_REGULAREXP, //æ­£è¦è¡¨ç¾ + IDC_COMBO_CHARSET, HIDC_GREP_COMBO_CHARSET, //文字コードセット + 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_BUTTON_FOLDER_UP, HIDC_GREP_BUTTON_FOLDER_UP, //上 + IDC_RADIO_OUTPUTLINE, HIDC_GREP_RADIO_OUTPUTLINE, //çµæžœå‡ºåŠ›ï¼šè¡Œå˜ä½ + IDC_RADIO_OUTPUTMARKED, HIDC_GREP_RADIO_OUTPUTMARKED, //çµæžœå‡ºåŠ›ï¼šè©²å½“部分 + IDC_RADIO_OUTPUTSTYLE1, HIDC_GREP_RADIO_OUTPUTSTYLE1, //çµæžœå‡ºåŠ›å½¢å¼ï¼šãƒŽãƒ¼ãƒžãƒ« + 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_CHECK_FILE_ONLY, HIDC_CHECK_FILE_ONLY, //ファイル毎最åˆã®ã¿æ¤œç´¢ + 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 @@ -67,12 +67,12 @@ static void SetGrepFolder( HWND hwndCtrl, LPCTSTR folder ); CDlgGrep::CDlgGrep() { - m_bSubFolder = FALSE; // ƒTƒuƒtƒHƒ‹ƒ_‚©‚ç‚àŒŸõ‚·‚é - m_bFromThisText = FALSE; // ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é - m_sSearchOption.Reset(); // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_nGrepCharSet = CODE_SJIS; // •¶ŽšƒR[ƒhƒZƒbƒg - m_nGrepOutputLineType = 1; // s‚ðo—Í/ŠY“–•”•ª/”Ûƒ}ƒbƒ`s ‚ðo—Í - m_nGrepOutputStyle = 1; // Grep: o—ÍŒ`Ž® + m_bSubFolder = FALSE; // サブフォルダã‹ã‚‰ã‚‚検索ã™ã‚‹ + m_bFromThisText = FALSE; // ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ + m_sSearchOption.Reset(); // 検索オプション + m_nGrepCharSet = CODE_SJIS; // 文字コードセット + m_nGrepOutputLineType = 1; // 行を出力/該当部分/å¦ãƒžãƒƒãƒè¡Œ を出力 + m_nGrepOutputStyle = 1; // Grep: å‡ºåŠ›å½¢å¼ m_bGrepOutputFileOnly = false; m_bGrepOutputBaseFolder = false; m_bGrepSeparateFolder = false; @@ -84,9 +84,9 @@ CDlgGrep::CDlgGrep() } /*! - ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃hƒƒbƒvƒ_ƒEƒ“ƒƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + コンボボックスã®ãƒ‰ãƒ­ãƒƒãƒ—ダウンメッセージをæ•æ‰ã™ã‚‹ - @date 2013.03.24 novice V‹Kì¬ + @date 2013.03.24 novice æ–°è¦ä½œæˆ */ BOOL CDlgGrep::OnCbnDropDown( HWND hwndCtl, int wID ) { @@ -119,25 +119,25 @@ BOOL CDlgGrep::OnCbnDropDown( HWND hwndCtl, int wID ) return CDialog::OnCbnDropDown( hwndCtl, wID ); } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgGrep::DoModal( HINSTANCE hInstance, HWND hwndParent, const TCHAR* pszCurrentFilePath ) { - m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: ƒTƒuƒtƒHƒ‹ƒ_‚àŒŸõ - m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_nGrepCharSet = m_pShareData->m_Common.m_sSearch.m_nGrepCharSet; // •¶ŽšƒR[ƒhƒZƒbƒg - m_nGrepOutputLineType = m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType; // s‚ðo—Í/ŠY“–•”•ª/”Ûƒ}ƒbƒ`s ‚ðo—Í - m_nGrepOutputStyle = m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle; // Grep: o—ÍŒ`Ž® + 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; // 行を出力/該当部分/å¦ãƒžãƒƒãƒè¡Œ を出力 + m_nGrepOutputStyle = m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle; // Grep: å‡ºåŠ›å½¢å¼ m_bGrepOutputFileOnly = m_pShareData->m_Common.m_sSearch.m_bGrepOutputFileOnly; m_bGrepOutputBaseFolder = m_pShareData->m_Common.m_sSearch.m_bGrepOutputBaseFolder; m_bGrepSeparateFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSeparateFolder; - // 2013.05.21 ƒRƒ“ƒXƒgƒ‰ƒNƒ^‚©‚çDoModal‚Ɉړ® - // m_strText ‚͌ĂÑo‚µŒ³‚ÅÝ’èÏ‚Ý + // 2013.05.21 コンストラクタã‹ã‚‰DoModalã«ç§»å‹• + // m_strText ã¯å‘¼ã³å‡ºã—å…ƒã§è¨­å®šæ¸ˆã¿ if( m_szFile[0] == _T('\0') && m_pShareData->m_sSearchKeywords.m_aGrepFiles.size() ){ - _tcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* ŒŸõƒtƒ@ƒCƒ‹ */ + _tcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* 検索ファイル */ } if( m_szFolder[0] == _T('\0') && m_pShareData->m_sSearchKeywords.m_aGrepFolders.size() ){ - _tcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* ŒŸõƒtƒHƒ‹ƒ_ */ + _tcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダ */ } if( pszCurrentFilePath ){ // 2010.01.10 ryoji @@ -155,20 +155,20 @@ BOOL CDlgGrep::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { _SetHwnd( hwndDlg ); - /* ƒ†[ƒU[‚ªƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃GƒfƒBƒbƒg ƒRƒ“ƒgƒ[ƒ‹‚É“ü—Í‚Å‚«‚éƒeƒLƒXƒg‚Ì’·‚³‚ð§ŒÀ‚·‚é */ + /* ユーザーãŒã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹ã®ã‚¨ãƒ‡ã‚£ãƒƒãƒˆ コントロールã«å…¥åŠ›ã§ãるテキストã®é•·ã•ã‚’制é™ã™ã‚‹ */ // Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), _MAX_PATH - 1 ); Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_FILE ), _countof2(m_szFile) - 1 ); Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_FOLDER ), _countof2(m_szFolder) - 1 ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_FILE ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_FOLDER ), TRUE ); - /* ƒ_ƒCƒAƒƒO‚̃AƒCƒRƒ“ */ -//2002.02.08 GrepƒAƒCƒRƒ“‚à‘å‚«‚¢ƒAƒCƒRƒ“‚Ƭ‚³‚¢ƒAƒCƒRƒ“‚ð•ÊX‚É‚·‚éB + /* ダイアログã®ã‚¢ã‚¤ã‚³ãƒ³ */ +//2002.02.08 Grepアイコンも大ãã„アイコンã¨å°ã•ã„アイコンを別々ã«ã™ã‚‹ã€‚ HICON hIconBig, hIconSmall; - // Dec, 2, 2002 genta ƒAƒCƒRƒ““Ç‚Ýž‚Ý•û–@•ÏX + // Dec, 2, 2002 genta アイコン読ã¿è¾¼ã¿æ–¹æ³•å¤‰æ›´ hIconBig = GetAppIcon( m_hInstance, ICON_DEFAULT_GREP, FN_GREP_ICON, false ); hIconSmall = GetAppIcon( m_hInstance, ICON_DEFAULT_GREP, FN_GREP_ICON, true ); ::SendMessageAny( GetHwnd(), WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall ); @@ -176,7 +176,7 @@ BOOL CDlgGrep::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // 2002/09/22 Moca Add int i; - /* •¶ŽšƒR[ƒhƒZƒbƒg‘I‘ðƒRƒ“ƒ{ƒ{ƒbƒNƒX‰Šú‰» */ + /* 文字コードセットé¸æŠžã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆæœŸåŒ– */ CCodeTypesForCombobox cCodeTypes; for( i = 0; i < cCodeTypes.GetCount(); ++i ){ int idx = Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_CHARSET ), cCodeTypes.GetName(i) ); @@ -198,20 +198,20 @@ BOOL CDlgGrep::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_comboDelFolder.pRecent = &m_cRecentGrepFolder; SetComboBoxDeleter(GetItemHwnd(IDC_COMBO_FOLDER), &m_comboDelFolder); - // ƒtƒHƒ“ƒgÝ’è 2012/11/27 Uchi + // フォント設定 2012/11/27 Uchi HFONT hFontOld = (HFONT)::SendMessageAny( GetItemHwnd( IDC_COMBO_TEXT ), WM_GETFONT, 0, 0 ); HFONT hFont = SetMainFont( GetItemHwnd( IDC_COMBO_TEXT ) ); m_cFontText.SetFont( hFontOld, hFont, GetItemHwnd( IDC_COMBO_TEXT ) ); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ // CreateSizeBox(); return CDialog::OnInitDialog( hwndDlg, wParam, lParam ); } -/*! @brief ƒtƒHƒ‹ƒ_Žw’èEditBox‚̃R[ƒ‹ƒoƒbƒNŠÖ” +/*! @brief フォルダ指定EditBoxã®ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯é–¢æ•° - @date 2007.02.09 bosagami V‹Kì¬ - @date 2007.09.02 genta ƒfƒBƒŒƒNƒgƒŠƒ`ƒFƒbƒN‚ð‹­‰» + @date 2007.02.09 bosagami æ–°è¦ä½œæˆ + @date 2007.09.02 genta ディレクトリãƒã‚§ãƒƒã‚¯ã‚’強化 */ LRESULT CALLBACK OnFolderProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam) { @@ -226,12 +226,12 @@ LRESULT CALLBACK OnFolderProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam) DragQueryFile((HDROP)wparam, 0, sPath, _countof2(sPath) - 1); ::DragFinish((HDROP)wparam); - //ƒtƒ@ƒCƒ‹ƒpƒX‚Ì‰ðŒˆ + //ファイルパスã®è§£æ±º CSakuraEnvironment::ResolvePath(sPath); - // ƒtƒ@ƒCƒ‹‚ªƒhƒƒbƒv‚³‚ꂽꇂ̓tƒHƒ‹ƒ_‚ðØ‚èo‚· - // ƒtƒHƒ‹ƒ_‚ÌꇂÍŌオŽ¸‚í‚ê‚é‚Ì‚Åsplit‚µ‚Ä‚Í‚¢‚¯‚È‚¢D - if( IsFileExists( sPath, true )){ // ‘æ2ˆø”‚ªtrue‚¾‚ƃfƒBƒŒƒNƒgƒŠ‚Í‘ÎÛŠO + // ファイルãŒãƒ‰ãƒ­ãƒƒãƒ—ã•ã‚ŒãŸå ´åˆã¯ãƒ•ã‚©ãƒ«ãƒ€ã‚’切り出㙠+ // フォルダã®å ´åˆã¯æœ€å¾ŒãŒå¤±ã‚れるã®ã§splitã—ã¦ã¯ã„ã‘ãªã„． + if( IsFileExists( sPath, true )){ // 第2引数ãŒtrueã ã¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯å¯¾è±¡å¤– SFilePath szWork; SplitPath_FolderAndFile( sPath, szWork, NULL ); _tcscpy( sPath, szWork ); @@ -254,16 +254,16 @@ BOOL CDlgGrep::OnBnClicked( int wID ) { switch( wID ){ case IDC_BUTTON_HELP: - /* uGrepv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_GREP_DIALOG) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「Grepã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_GREP_DIALOG) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDC_CHK_FROMTHISTEXT: /* ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é */ - // 2010.05.30 ŠÖ”‰» + case IDC_CHK_FROMTHISTEXT: /* ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ */ + // 2010.05.30 関数化 SetDataFromThisText( 0 != ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_FROMTHISTEXT ) ); return TRUE; - case IDC_BUTTON_CURRENTFOLDER: /* Œ»Ý•ÒW’†‚̃tƒ@ƒCƒ‹‚̃tƒHƒ‹ƒ_ */ - /* ƒtƒ@ƒCƒ‹‚ðŠJ‚¢‚Ä‚¢‚é‚© */ + case IDC_BUTTON_CURRENTFOLDER: /* ç¾åœ¨ç·¨é›†ä¸­ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ•ã‚©ãƒ«ãƒ€ */ + /* ファイルを開ã„ã¦ã„ã‚‹ã‹ */ if( m_szCurrentFilePath[0] != _T('\0') ){ TCHAR szWorkFolder[MAX_PATH]; TCHAR szWorkFile[MAX_PATH]; @@ -271,7 +271,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) SetGrepFolder( GetItemHwnd(IDC_COMBO_FOLDER), szWorkFolder ); } else{ - /* Œ»Ý‚̃vƒƒZƒX‚̃JƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ‚ðŽæ“¾‚µ‚Ü‚· */ + /* ç¾åœ¨ã®ãƒ—ロセスã®ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’å–å¾—ã—ã¾ã™ */ TCHAR szWorkFolder[MAX_PATH]; ::GetCurrentDirectory( _countof( szWorkFolder ) - 1, szWorkFolder ); SetGrepFolder( GetItemHwnd(IDC_COMBO_FOLDER), szWorkFolder ); @@ -286,7 +286,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) std::vector vPaths; CGrepAgent::CreateFolders( szFolder, vPaths ); if( 0 < vPaths.size() ){ - // ÅŒã‚̃pƒX‚ª‘€ì‘ÎÛ + // 最後ã®ãƒ‘スãŒæ“作対象 auto_strncpy( szFolder, vPaths.rbegin()->c_str(), nMaxPath ); szFolder[nMaxPath-1] = _T('\0'); if( DirectoryUp( szFolder ) ){ @@ -316,49 +316,49 @@ BOOL CDlgGrep::OnBnClicked( int wID ) return TRUE; -// case IDC_CHK_LOHICASE: /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ +// case IDC_CHK_LOHICASE: /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ // MYTRACE( _T("IDC_CHK_LOHICASE\n") ); // return TRUE; - case IDC_CHK_REGULAREXP: /* ³‹K•\Œ» */ + case IDC_CHK_REGULAREXP: /* æ­£è¦è¡¨ç¾ */ // MYTRACE( _T("IDC_CHK_REGULAREXP ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) = %d\n"), ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ); if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ){ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— if( !CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, true ) ){ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 0 ); }else{ // To Here Jun. 26, 2001 genta - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ - // ³‹K•\Œ»‚Ì‚Æ‚«‚à‘I‘ð‚Å‚«‚é‚悤‚ÉB + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ + // æ­£è¦è¡¨ç¾ã®ã¨ãã‚‚é¸æŠžã§ãるよã†ã«ã€‚ // ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 1 ); // ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), FALSE ); //2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); } }else{ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ - // ³‹K•\Œ»‚Ì‚Æ‚«‚à‘I‘ð‚Å‚«‚é‚悤‚ÉB + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ + // æ­£è¦è¡¨ç¾ã®ã¨ãã‚‚é¸æŠžã§ãるよã†ã«ã€‚ // ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), TRUE ); // ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 0 ); //2001/06/23 N.Nakatani -//’PŒê’PˆÊ‚Ìgrep‚ªŽÀ‘•‚³‚ꂽ‚çƒRƒƒ“ƒg‚ðŠO‚·‚ÆŽv‚¢‚Ü‚· -//2002/03/07ŽÀ‘•‚µ‚Ä‚Ý‚½B - /* ’PŒê’PˆÊ‚ÅŒŸõ */ +//å˜èªžå˜ä½ã®grepãŒå®Ÿè£…ã•ã‚ŒãŸã‚‰ã‚³ãƒ¡ãƒ³ãƒˆã‚’外ã™ã¨æ€ã„ã¾ã™ +//2002/03/07実装ã—ã¦ã¿ãŸã€‚ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), TRUE ); } return TRUE; case IDC_BUTTON_FOLDER: - /* ƒtƒHƒ‹ƒ_ŽQƃ{ƒ^ƒ“ */ + /* フォルダå‚照ボタン */ { const int nMaxPath = MAX_GREP_PATH; TCHAR szFolder[nMaxPath]; - /* ŒŸõƒtƒHƒ‹ƒ_ */ + /* 検索フォルダ */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_FOLDER, szFolder, nMaxPath - 1 ); if( szFolder[0] == _T('\0') ){ ::GetCurrentDirectory( nMaxPath, szFolder ); @@ -379,7 +379,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) } return TRUE; case IDC_CHK_DEFAULTFOLDER: - /* ƒtƒHƒ‹ƒ_‚̉Šú’l‚ðƒJƒŒƒ“ƒgƒtƒHƒ‹ƒ_‚É‚·‚é */ + /* フォルダã®åˆæœŸå€¤ã‚’カレントフォルダã«ã™ã‚‹ */ { m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_DEFAULTFOLDER ); } @@ -398,7 +398,7 @@ BOOL CDlgGrep::OnBnClicked( int wID ) } break; case IDOK: - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ if( GetData() ){ // ::EndDialog( hwndDlg, TRUE ); CloseDialog( TRUE ); @@ -410,22 +410,22 @@ BOOL CDlgGrep::OnBnClicked( int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgGrep::SetData( void ) { - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_strText.c_str() ); - /* ŒŸõƒtƒ@ƒCƒ‹ */ + /* 検索ファイル */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_FILE, m_szFile ); - /* ŒŸõƒtƒHƒ‹ƒ_ */ + /* 検索フォルダ */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_FOLDER, m_szFolder ); if((m_szFolder[0] == _T('\0') || m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder) && @@ -437,29 +437,29 @@ void CDlgGrep::SetData( void ) SetGrepFolder( GetItemHwnd(IDC_COMBO_FOLDER), szWorkFolder ); } - /* ƒTƒuƒtƒHƒ‹ƒ_‚©‚ç‚àŒŸõ‚·‚é */ + /* サブフォルダã‹ã‚‰ã‚‚検索ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_SUBFOLDER, m_bSubFolder ); - // ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é + // ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ ::CheckDlgButton( GetHwnd(), IDC_CHK_FROMTHISTEXT, m_bFromThisText ); - // 2010.05.30 ŠÖ”‰» + // 2010.05.30 関数化 SetDataFromThisText( m_bFromThisText != FALSE ); - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, m_sSearchOption.bLoHiCase ); - // 2001/06/23 N.Nakatani Œ»Žž“_‚Å‚ÍGrep‚Å‚Í’PŒê’PˆÊ‚ÌŒŸõ‚̓Tƒ|[ƒg‚Å‚«‚Ä‚¢‚Ü‚¹‚ñ - // 2002/03/07 ƒeƒXƒgƒTƒ|[ƒg - /* ˆê’v‚·‚é’PŒê‚Ì‚ÝŒŸõ‚·‚é */ + // 2001/06/23 N.Nakatani ç¾æ™‚点ã§ã¯Grepã§ã¯å˜èªžå˜ä½ã®æ¤œç´¢ã¯ã‚µãƒãƒ¼ãƒˆã§ãã¦ã„ã¾ã›ã‚“ + // 2002/03/07 テストサãƒãƒ¼ãƒˆ + /* 一致ã™ã‚‹å˜èªžã®ã¿æ¤œç´¢ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_WORD, m_sSearchOption.bWordOnly ); -// ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ) , false ); //ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ðŽg—p•s‰Â‚É‚·‚à +// ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ) , false ); //ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã‚’使用ä¸å¯ã«ã™ã‚‚ - /* •¶ŽšƒR[ƒhŽ©“®”»•Ê */ + /* 文字コード自動判別 */ // ::CheckDlgButton( GetHwnd(), IDC_CHK_KANJICODEAUTODETECT, m_bKanjiCode_AutoDetect ); // 2002/09/22 Moca Add - /* •¶ŽšƒR[ƒhƒZƒbƒg */ + /* 文字コードセット */ { int nIdx, nCurIdx = -1; ECodeType nCharSet; @@ -484,7 +484,7 @@ void CDlgGrep::SetData( void ) } } - /* s‚ðo—Í‚·‚é‚©ŠY“–•”•ª‚¾‚¯o—Í‚·‚é‚© */ + /* 行を出力ã™ã‚‹ã‹è©²å½“部分ã ã‘出力ã™ã‚‹ã‹ */ if( m_nGrepOutputLineType == 1 ){ ::CheckDlgButton( GetHwnd(), IDC_RADIO_OUTPUTLINE, TRUE ); }else if( m_nGrepOutputLineType == 2 ){ @@ -495,7 +495,7 @@ void CDlgGrep::SetData( void ) ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHECK_BASE_PATH ), TRUE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHECK_SEP_FOLDER ),TRUE ); - /* Grep: o—ÍŒ`Ž® */ + /* Grep: å‡ºåŠ›å½¢å¼ */ if( 1 == m_nGrepOutputStyle ){ ::CheckDlgButton( GetHwnd(), IDC_RADIO_OUTPUTSTYLE1, TRUE ); }else @@ -511,19 +511,19 @@ void CDlgGrep::SetData( void ) } // From Here Jun. 29, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ - // ˆ—ƒtƒ[‹y‚Ñ”»’èðŒ‚ÌŒ©’¼‚µB•K‚¸³‹K•\Œ»‚̃`ƒFƒbƒN‚Æ - // –³ŠÖŒW‚ÉCheckRegexpVersion‚ð’ʉ߂·‚é‚悤‚É‚µ‚½B + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— + // 処ç†ãƒ•ãƒ­ãƒ¼åŠã³åˆ¤å®šæ¡ä»¶ã®è¦‹ç›´ã—。必ãšæ­£è¦è¡¨ç¾ã®ãƒã‚§ãƒƒã‚¯ã¨ + // 無関係ã«CheckRegexpVersionを通éŽã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚ if( CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, false ) && m_sSearchOption.bRegularExp){ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 1 ); - // ³‹K•\Œ»‚Ì‚Æ‚«‚à‘I‘ð‚Å‚«‚é‚悤‚ÉB + // æ­£è¦è¡¨ç¾ã®ã¨ãã‚‚é¸æŠžã§ãるよã†ã«ã€‚ // ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 1 ); // ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), FALSE ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); } else { @@ -541,7 +541,7 @@ void CDlgGrep::SetData( void ) CheckDlgButtonBool( GetHwnd(), IDC_CHECK_BASE_PATH, m_bGrepOutputBaseFolder ); CheckDlgButtonBool( GetHwnd(), IDC_CHECK_SEP_FOLDER, m_bGrepSeparateFolder ); - // ƒtƒHƒ‹ƒ_‚̉Šú’l‚ðƒJƒŒƒ“ƒgƒtƒHƒ‹ƒ_‚É‚·‚é + // フォルダã®åˆæœŸå€¤ã‚’カレントフォルダã«ã™ã‚‹ ::CheckDlgButton( GetHwnd(), IDC_CHK_DEFAULTFOLDER, m_pShareData->m_Common.m_sSearch.m_bGrepDefaultFolder ); return; @@ -549,7 +549,7 @@ void CDlgGrep::SetData( void ) /*! - Œ»Ý•ÒW’†ƒtƒ@ƒCƒ‹‚©‚猟õƒ`ƒFƒbƒN‚Å‚ÌÝ’è + ç¾åœ¨ç·¨é›†ä¸­ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰æ¤œç´¢ãƒã‚§ãƒƒã‚¯ã§ã®è¨­å®š */ void CDlgGrep::SetDataFromThisText( bool bChecked ) { @@ -557,7 +557,7 @@ void CDlgGrep::SetDataFromThisText( bool bChecked ) if( 0 != m_szCurrentFilePath[0] && bChecked ){ TCHAR szWorkFolder[MAX_PATH]; TCHAR szWorkFile[MAX_PATH]; - // 2003.08.01 Moca ƒtƒ@ƒCƒ‹–¼‚̓Xƒy[ƒX‚È‚Ç‚Í‹æØ‚è‹L†‚É‚È‚é‚Ì‚ÅA""‚ň͂¢AƒGƒXƒP[ƒv‚·‚é + // 2003.08.01 Moca ファイルåã¯ã‚¹ãƒšãƒ¼ã‚¹ãªã©ã¯åŒºåˆ‡ã‚Šè¨˜å·ã«ãªã‚‹ã®ã§ã€""ã§å›²ã„ã€ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ã™ã‚‹ szWorkFile[0] = _T('"'); SplitPath_FolderAndFile( m_szCurrentFilePath, szWorkFolder, szWorkFile + 1 ); _tcscat( szWorkFile, _T("\"") ); // 2003.08.01 Moca @@ -575,32 +575,32 @@ void CDlgGrep::SetDataFromThisText( bool bChecked ) return; } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 - @retval TRUE ³í - @retval FALSE “ü—̓Gƒ‰[ +/*! ダイアログデータã®å–å¾— + @retval TRUE 正常 + @retval FALSE 入力エラー */ int CDlgGrep::GetData( void ) { - /* ƒTƒuƒtƒHƒ‹ƒ_‚©‚ç‚àŒŸõ‚·‚é*/ + /* サブフォルダã‹ã‚‰ã‚‚検索ã™ã‚‹*/ m_bSubFolder = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_SUBFOLDER ); - /* ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é */ + /* ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ */ m_bFromThisText = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_FROMTHISTEXT ); - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ m_sSearchOption.bLoHiCase = (0!=::IsDlgButtonChecked( GetHwnd(), IDC_CHK_LOHICASE )); //2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚ÅŒŸõ */ + /* å˜èªžå˜ä½ã§æ¤œç´¢ */ m_sSearchOption.bWordOnly = (0!=::IsDlgButtonChecked( GetHwnd(), IDC_CHK_WORD )); - /* ³‹K•\Œ» */ + /* æ­£è¦è¡¨ç¾ */ m_sSearchOption.bRegularExp = (0!=::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP )); - /* •¶ŽšƒR[ƒhŽ©“®”»•Ê */ + /* 文字コード自動判別 */ // m_bKanjiCode_AutoDetect = ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_KANJICODEAUTODETECT ); - /* •¶ŽšƒR[ƒhƒZƒbƒg */ + /* 文字コードセット */ { int nIdx; HWND hWndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_CHARSET ); @@ -609,7 +609,7 @@ int CDlgGrep::GetData( void ) } - /* s‚ðo—Í/ŠY“–•”•ª/”Ûƒ}ƒbƒ`s ‚ðo—Í */ + /* 行を出力/該当部分/å¦ãƒžãƒƒãƒè¡Œ を出力 */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_OUTPUTLINE ) ){ m_nGrepOutputLineType = 1; }else if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_NOHIT ) ){ @@ -618,12 +618,12 @@ int CDlgGrep::GetData( void ) m_nGrepOutputLineType = 0; } - /* Grep: o—ÍŒ`Ž® */ + /* Grep: å‡ºåŠ›å½¢å¼ */ if( FALSE != ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_OUTPUTSTYLE1 ) ){ - m_nGrepOutputStyle = 1; /* Grep: o—ÍŒ`Ž® */ + m_nGrepOutputStyle = 1; /* Grep: å‡ºåŠ›å½¢å¼ */ } if( FALSE != ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_OUTPUTSTYLE2 ) ){ - m_nGrepOutputStyle = 2; /* Grep: o—ÍŒ`Ž® */ + m_nGrepOutputStyle = 2; /* Grep: å‡ºåŠ›å½¢å¼ */ } if( FALSE != ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_OUTPUTSTYLE3 ) ){ m_nGrepOutputStyle = 3; @@ -634,27 +634,27 @@ int CDlgGrep::GetData( void ) m_bGrepSeparateFolder = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_SEP_FOLDER ); - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ int nBufferSize = ::GetWindowTextLength( GetItemHwnd(IDC_COMBO_TEXT) ) + 1; std::vector vText(nBufferSize); ::DlgItem_GetText( GetHwnd(), IDC_COMBO_TEXT, &vText[0], nBufferSize); m_strText = to_wchar(&vText[0]); m_bSetText = true; - /* ŒŸõƒtƒ@ƒCƒ‹ */ + /* 検索ファイル */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_FILE, m_szFile, _countof2(m_szFile) ); - /* ŒŸõƒtƒHƒ‹ƒ_ */ + /* 検索フォルダ */ ::DlgItem_GetText( GetHwnd(), IDC_COMBO_FOLDER, m_szFolder, _countof2(m_szFolder) ); - m_pShareData->m_Common.m_sSearch.m_nGrepCharSet = m_nGrepCharSet; // •¶ŽšƒR[ƒhŽ©“®”»•Ê - m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType = m_nGrepOutputLineType; // s‚ðo—Í/ŠY“–•”•ª/”Ûƒ}ƒbƒ`s ‚ðo—Í - m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle = m_nGrepOutputStyle; // Grep: o—ÍŒ`Ž® + m_pShareData->m_Common.m_sSearch.m_nGrepCharSet = m_nGrepCharSet; // 文字コード自動判別 + m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType = m_nGrepOutputLineType; // 行を出力/該当部分/å¦ãƒžãƒƒãƒè¡Œ を出力 + m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle = m_nGrepOutputStyle; // Grep: å‡ºåŠ›å½¢å¼ m_pShareData->m_Common.m_sSearch.m_bGrepOutputFileOnly = m_bGrepOutputFileOnly; m_pShareData->m_Common.m_sSearch.m_bGrepOutputBaseFolder = m_bGrepOutputBaseFolder; m_pShareData->m_Common.m_sSearch.m_bGrepSeparateFolder = m_bGrepSeparateFolder; -//‚â‚ß‚Ü‚µ‚½ +//ã‚„ã‚ã¾ã—㟠// if( 0 == wcslen( m_szText ) ){ -// WarningMessage( GetHwnd(), _T("ŒŸõ‚̃L[ƒ[ƒh‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B") ); +// WarningMessage( GetHwnd(), _T("検索ã®ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã‚’指定ã—ã¦ãã ã•ã„。") ); // return FALSE; // } if( 0 != auto_strlen( m_szFile ) ){ @@ -668,11 +668,11 @@ int CDlgGrep::GetData( void ) return FALSE; } } - /* ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é */ + /* ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ */ if( m_szFile[0] == _T('\0') ){ // Jun. 16, 2003 Moca - // ŒŸõƒpƒ^[ƒ“‚ªŽw’肳‚ê‚Ä‚¢‚È‚¢ê‡‚̃ƒbƒZ[ƒW•\Ž¦‚ð‚â‚ßA - // u*.*v‚ªŽw’肳‚ꂽ‚à‚Ì‚ÆŒ©‚È‚·D + // 検索パターンãŒæŒ‡å®šã•ã‚Œã¦ã„ãªã„å ´åˆã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸è¡¨ç¤ºã‚’ã‚„ã‚〠+ // 「*.*ã€ãŒæŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã¨è¦‹ãªã™ï¼Ž _tcscpy( m_szFile, _T("*.*") ); } if( m_szFolder[0] == _T('\0') ){ @@ -681,10 +681,10 @@ int CDlgGrep::GetData( void ) } { - //ƒJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ‚ð•Û‘¶B‚±‚̃uƒƒbƒN‚©‚甲‚¯‚é‚Æ‚«‚ÉŽ©“®‚ŃJƒŒƒ“ƒgƒfƒBƒŒƒNƒgƒŠ‚Í•œŒ³‚³‚ê‚éB + //カレントディレクトリをä¿å­˜ã€‚ã“ã®ãƒ–ロックã‹ã‚‰æŠœã‘ã‚‹ã¨ãã«è‡ªå‹•ã§ã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¯å¾©å…ƒã•ã‚Œã‚‹ã€‚ CCurrentDirectoryBackupPoint cCurDirBackup; - // 2011.11.24 Moca •¡”ƒtƒHƒ‹ƒ_Žw’è + // 2011.11.24 Moca 複数フォルダ指定 std::vector vPaths; CGrepAgent::CreateFolders( m_szFolder, vPaths ); int nFolderLen = 0; @@ -692,14 +692,14 @@ int CDlgGrep::GetData( void ) TCHAR szFolder[nMaxPath]; szFolder[0] = _T('\0'); for( int i = 0 ; i < (int)vPaths.size(); i ++ ){ - // ‘Š‘΃pƒX¨â‘΃pƒX + // 相対パス→絶対パス if( !::SetCurrentDirectory( vPaths[i].c_str() ) ){ WarningMessage( GetHwnd(), LS(STR_DLGGREP5) ); return FALSE; } TCHAR szFolderItem[nMaxPath]; ::GetCurrentDirectory( nMaxPath, szFolderItem ); - // ;‚ªƒtƒHƒ‹ƒ_–¼‚ÉŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç""‚ň͂¤ + // ;ãŒãƒ•ã‚©ãƒ«ãƒ€åã«å«ã¾ã‚Œã¦ã„ãŸã‚‰""ã§å›²ã† if( auto_strchr( szFolderItem, _T(';') ) ){ szFolderItem[0] = _T('"'); ::GetCurrentDirectory( nMaxPath, szFolderItem + 1 ); @@ -719,36 +719,36 @@ int CDlgGrep::GetData( void ) auto_strcpy( m_szFolder, szFolder ); } -//@@@ 2002.2.2 YAZAKI CShareData.AddToSearchKeyArr()’ljÁ‚É”º‚¤•ÏX - /* ŒŸõ•¶Žš—ñ */ +//@@@ 2002.2.2 YAZAKI CShareData.AddToSearchKeyArr()追加ã«ä¼´ã†å¤‰æ›´ + /* 検索文字列 */ if( 0 < m_strText.size() ){ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— int nFlag = 0; nFlag |= m_sSearchOption.bLoHiCase ? 0x01 : 0x00; if( m_sSearchOption.bRegularExp && !CheckRegexpSyntax( m_strText.c_str(), GetHwnd(), true, nFlag) ){ return FALSE; } - // To Here Jun. 26, 2001 genta ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ·‚µ‘Ö‚¦ + // To Here Jun. 26, 2001 genta æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリ差ã—替㈠if( m_strText.size() < _MAX_PATH ){ CSearchKeywordManager().AddToSearchKeyArr( m_strText.c_str() ); - m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ + m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // 検索オプション } }else{ - // 2014.07.01 ‹óƒL[‚à“o˜^‚·‚é + // 2014.07.01 空キーも登録ã™ã‚‹ CSearchKeywordManager().AddToSearchKeyArr( L"" ); } - // ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚éê‡A—š—ð‚ÉŽc‚³‚È‚¢ Uchi 2008/5/23 - // 2016.03.08 Moca u‚±‚̃tƒ@ƒCƒ‹‚©‚猟õv‚Ìꇂ̓TƒuƒtƒHƒ‹ƒ_‹¤’ÊÝ’è‚ðXV‚µ‚È‚¢ + // ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹å ´åˆã€å±¥æ­´ã«æ®‹ã•ãªã„ Uchi 2008/5/23 + // 2016.03.08 Moca 「ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰æ¤œç´¢ã€ã®å ´åˆã¯ã‚µãƒ–フォルダ共通設定を更新ã—ãªã„ if (!m_bFromThisText) { - /* ŒŸõƒtƒ@ƒCƒ‹ */ + /* 検索ファイル */ CSearchKeywordManager().AddToGrepFileArr( m_szFile ); - /* ŒŸõƒtƒHƒ‹ƒ_ */ + /* 検索フォルダ */ CSearchKeywordManager().AddToGrepFolderArr( m_szFolder ); - // GrepFƒTƒuƒtƒHƒ‹ƒ_‚àŒŸõ + // 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 6a0bbc6e20..5d5df0dfb3 100644 --- a/sakura_core/dlg/CDlgGrep.h +++ b/sakura_core/dlg/CDlgGrep.h @@ -1,9 +1,9 @@ -/*! @file - @brief GREPƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief GREPダイアログボックス @author Norio Nakatani - @date 1998.09/07 V‹Kì¬ - @date 1999.12/05 Äì¬ + @date 1998.09/07 æ–°è¦ä½œæˆ + @date 1999.12/05 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -22,7 +22,7 @@ class CDlgGrep; #include "recent/CRecent.h" #include "util/window.h" -//! GREPƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +//! GREPダイアログボックス class CDlgGrep : public CDialog { public: @@ -34,27 +34,27 @@ class CDlgGrep : public CDialog || Attributes & Operations */ BOOL OnCbnDropDown( HWND hwndCtl, int wID ); - int DoModal( HINSTANCE, HWND, const TCHAR* ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ -// HWND DoModeless( HINSTANCE, HWND, const char* ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, const TCHAR* ); /* モーダルダイアログã®è¡¨ç¤º */ +// HWND DoModeless( HINSTANCE, HWND, const char* ); /* モードレスダイアログã®è¡¨ç¤º */ - BOOL m_bSubFolder;/*!< ƒTƒuƒtƒHƒ‹ƒ_‚©‚ç‚àŒŸõ‚·‚é */ - BOOL m_bFromThisText;/*!< ‚±‚Ì•ÒW’†‚̃eƒLƒXƒg‚©‚猟õ‚·‚é */ + BOOL m_bSubFolder;/*!< サブフォルダã‹ã‚‰ã‚‚検索ã™ã‚‹ */ + BOOL m_bFromThisText;/*!< ã“ã®ç·¨é›†ä¸­ã®ãƒ†ã‚­ã‚¹ãƒˆã‹ã‚‰æ¤œç´¢ã™ã‚‹ */ - SSearchOption m_sSearchOption; //!< ŒŸõƒIƒvƒVƒ‡ƒ“ + SSearchOption m_sSearchOption; //!< 検索オプション - ECodeType m_nGrepCharSet; /*!< •¶ŽšƒR[ƒhƒZƒbƒg */ - int m_nGrepOutputStyle; /*!< Grep: o—ÍŒ`Ž® */ - int m_nGrepOutputLineType; //!< Œ‹‰Êo—ÍFs‚ðo—Í/ŠY“–•”•ª/”Ûƒ}ƒbƒ`s - bool m_bGrepOutputFileOnly; /*!< ƒtƒ@ƒCƒ‹–ˆÅ‰‚Ì‚ÝŒŸõ */ - bool m_bGrepOutputBaseFolder; /*!< ƒx[ƒXƒtƒHƒ‹ƒ_•\Ž¦ */ - bool m_bGrepSeparateFolder; /*!< ƒtƒHƒ‹ƒ_–ˆ‚É•\Ž¦ */ + ECodeType m_nGrepCharSet; /*!< 文字コードセット */ + int m_nGrepOutputStyle; /*!< Grep: å‡ºåŠ›å½¢å¼ */ + int m_nGrepOutputLineType; //!< çµæžœå‡ºåŠ›ï¼šè¡Œã‚’出力/該当部分/å¦ãƒžãƒƒãƒè¡Œ + bool m_bGrepOutputFileOnly; /*!< ファイル毎最åˆã®ã¿æ¤œç´¢ */ + bool m_bGrepOutputBaseFolder; /*!< ベースフォルダ表示 */ + bool m_bGrepSeparateFolder; /*!< フォルダ毎ã«è¡¨ç¤º */ - std::wstring m_strText; /*!< ŒŸõ•¶Žš—ñ */ - bool m_bSetText; //!< ŒŸõ•¶Žš—ñ‚ðݒ肵‚½‚© - SFilePathLong m_szFile; //!< ŒŸõƒtƒ@ƒCƒ‹ - SFilePathLong m_szFolder; //!< ŒŸõƒtƒHƒ‹ƒ_ + std::wstring m_strText; /*!< 検索文字列 */ + bool m_bSetText; //!< 検索文字列を設定ã—ãŸã‹ + SFilePathLong m_szFile; //!< 検索ファイル + SFilePathLong m_szFolder; //!< 検索フォルダ SFilePath m_szCurrentFilePath; protected: SComboBoxItemDeleter m_comboDelText; @@ -66,16 +66,16 @@ class CDlgGrep : public CDialog CFontAutoDeleter m_cFontText; /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnDestroy(); BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - void SetDataFromThisText( bool ); /* Œ»Ý•ÒW’†ƒtƒ@ƒCƒ‹‚©‚猟õƒ`ƒFƒbƒN‚Å‚ÌÝ’è */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ + void SetDataFromThisText( bool ); /* ç¾åœ¨ç·¨é›†ä¸­ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰æ¤œç´¢ãƒã‚§ãƒƒã‚¯ã§ã®è¨­å®š */ }; diff --git a/sakura_core/dlg/CDlgGrepReplace.cpp b/sakura_core/dlg/CDlgGrepReplace.cpp index 2d9c18cf16..a6b723a3a0 100644 --- a/sakura_core/dlg/CDlgGrepReplace.cpp +++ b/sakura_core/dlg/CDlgGrepReplace.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief GREP’uŠ·ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief GREPç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author Norio Nakatani */ @@ -29,35 +29,35 @@ #include "sakura.hh" const DWORD p_helpids[] = { - IDC_BUTTON_FOLDER, HIDC_GREP_REP_BUTTON_FOLDER, //ƒtƒHƒ‹ƒ_ - IDC_BUTTON_CURRENTFOLDER, HIDC_GREP_REP_BUTTON_CURRENTFOLDER, //Œ»ƒtƒHƒ‹ƒ_ - IDOK, HIDOK_GREP_REP, //’uŠ·ŠJŽn - IDCANCEL, HIDCANCEL_GREP_REP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_GREP_REP_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHK_PASTE, HIDC_GREP_REP_CHK_PASTE, //ƒNƒŠƒbƒvƒ{[ƒh‚©‚ç“\‚è•t‚¯ - IDC_CHK_WORD, HIDC_GREP_REP_CHK_WORD, //’PŒê’PˆÊ - IDC_CHK_SUBFOLDER, HIDC_GREP_REP_CHK_SUBFOLDER, //ƒTƒuƒtƒHƒ‹ƒ_‚àŒŸõ -// IDC_CHK_FROMTHISTEXT, HIDC_GREP_REP_CHK_FROMTHISTEXT, //‚±‚̃tƒ@ƒCƒ‹‚©‚ç - IDC_CHK_LOHICASE, HIDC_GREP_REP_CHK_LOHICASE, //‘啶Žš¬•¶Žš - IDC_CHK_REGULAREXP, HIDC_GREP_REP_CHK_REGULAREXP, //³‹K•\Œ» - IDC_CHK_BACKUP, HIDC_GREP_REP_CHK_BACKUP, //ƒoƒbƒNƒAƒbƒvì¬ - IDC_COMBO_CHARSET, HIDC_GREP_REP_COMBO_CHARSET, //•¶ŽšƒR[ƒhƒZƒbƒg + 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_FROMTHISTEXT, HIDC_GREP_REP_CHK_FROMTHISTEXT, //ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ + IDC_CHK_LOHICASE, HIDC_GREP_REP_CHK_LOHICASE, //大文字å°æ–‡å­— + IDC_CHK_REGULAREXP, HIDC_GREP_REP_CHK_REGULAREXP, //æ­£è¦è¡¨ç¾ + IDC_CHK_BACKUP, HIDC_GREP_REP_CHK_BACKUP, //ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ä½œæˆ + IDC_COMBO_CHARSET, HIDC_GREP_REP_COMBO_CHARSET, //文字コードセット IDC_CHECK_CP, HIDC_GREP_REP_CHECK_CP, //CP - IDC_COMBO_TEXT, HIDC_GREP_REP_COMBO_TEXT, //’uŠ·‘O - IDC_COMBO_TEXT2, HIDC_GREP_REP_COMBO_TEXT2, //’uŠ·Œã - IDC_COMBO_FILE, HIDC_GREP_REP_COMBO_FILE, //ƒtƒ@ƒCƒ‹ - IDC_COMBO_FOLDER, HIDC_GREP_REP_COMBO_FOLDER, //ƒtƒHƒ‹ƒ_ - IDC_BUTTON_FOLDER_UP, HIDC_GREP_REP_BUTTON_FOLDER_UP, //ã - IDC_RADIO_OUTPUTLINE, HIDC_GREP_REP_RADIO_OUTPUTLINE, //Œ‹‰Êo—ÍFs’PˆÊ - IDC_RADIO_OUTPUTMARKED, HIDC_GREP_REP_RADIO_OUTPUTMARKED, //Œ‹‰Êo—ÍFŠY“–•”•ª - IDC_RADIO_OUTPUTSTYLE1, HIDC_GREP_REP_RADIO_OUTPUTSTYLE1, //Œ‹‰Êo—ÍŒ`Ž®Fƒm[ƒ}ƒ‹ - IDC_RADIO_OUTPUTSTYLE2, HIDC_GREP_REP_RADIO_OUTPUTSTYLE2, //Œ‹‰Êo—ÍŒ`Ž®Fƒtƒ@ƒCƒ‹–ˆ - IDC_RADIO_OUTPUTSTYLE3, HIDC_GREP_REP_RADIO_OUTPUTSTYLE3, //Œ‹‰Êo—ÍŒ`Ž®FŒ‹‰Ê‚Ì‚Ý - IDC_STATIC_JRE32VER, HIDC_GREP_REP_STATIC_JRE32VER, //³‹K•\Œ»ƒo[ƒWƒ‡ƒ“ - IDC_CHK_DEFAULTFOLDER, HIDC_GREP_REP_CHK_DEFAULTFOLDER, //ƒtƒHƒ‹ƒ_‚̉Šú’l‚ðƒJƒŒƒ“ƒgƒtƒHƒ‹ƒ_‚É‚·‚é - IDC_CHECK_FILE_ONLY, HIDC_GREP_REP_CHECK_FILE_ONLY, //ƒtƒ@ƒCƒ‹–ˆÅ‰‚Ì‚ÝŒŸõ - IDC_CHECK_BASE_PATH, HIDC_GREP_REP_CHECK_BASE_PATH, //ƒx[ƒXƒtƒHƒ‹ƒ_•\Ž¦ - IDC_CHECK_SEP_FOLDER, HIDC_GREP_REP_CHECK_SEP_FOLDER, //ƒtƒHƒ‹ƒ_–ˆ‚É•\Ž¦ + 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_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, //çµæžœå‡ºåŠ›ï¼šè©²å½“部分 + IDC_RADIO_OUTPUTSTYLE1, HIDC_GREP_REP_RADIO_OUTPUTSTYLE1, //çµæžœå‡ºåŠ›å½¢å¼ï¼šãƒŽãƒ¼ãƒžãƒ« + 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_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, //フォルダ毎ã«è¡¨ç¤º 0, 0 }; @@ -71,22 +71,22 @@ CDlgGrepReplace::CDlgGrepReplace() -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgGrepReplace::DoModal( HINSTANCE hInstance, HWND hwndParent, const TCHAR* pszCurrentFilePath, LPARAM lParam ) { - m_bSubFolder = m_pShareData->m_Common.m_sSearch.m_bGrepSubFolder; // Grep: ƒTƒuƒtƒHƒ‹ƒ_‚àŒŸõ - m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_nGrepCharSet = m_pShareData->m_Common.m_sSearch.m_nGrepCharSet; // •¶ŽšƒR[ƒhƒZƒbƒg - m_nGrepOutputLineType = m_pShareData->m_Common.m_sSearch.m_nGrepOutputLineType; // s‚ðo—Í‚·‚é‚©ŠY“–•”•ª‚¾‚¯o—Í‚·‚é‚© - m_nGrepOutputStyle = m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle; // Grep: o—ÍŒ`Ž® + 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; // 行を出力ã™ã‚‹ã‹è©²å½“部分ã ã‘出力ã™ã‚‹ã‹ + m_nGrepOutputStyle = m_pShareData->m_Common.m_sSearch.m_nGrepOutputStyle; // Grep: å‡ºåŠ›å½¢å¼ m_bPaste = false; m_bBackup = m_pShareData->m_Common.m_sSearch.m_bGrepBackup; if( m_szFile[0] == _T('\0') && m_pShareData->m_sSearchKeywords.m_aGrepFiles.size() ){ - _tcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* ŒŸõƒtƒ@ƒCƒ‹ */ + _tcscpy( m_szFile, m_pShareData->m_sSearchKeywords.m_aGrepFiles[0] ); /* 検索ファイル */ } if( m_szFolder[0] == _T('\0') && m_pShareData->m_sSearchKeywords.m_aGrepFolders.size() ){ - _tcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* ŒŸõƒtƒHƒ‹ƒ_ */ + _tcscpy( m_szFolder, m_pShareData->m_sSearchKeywords.m_aGrepFolders[0] ); /* 検索フォルダ */ } if( pszCurrentFilePath ){ // 2010.01.10 ryoji _tcscpy(m_szCurrentFilePath, pszCurrentFilePath); @@ -99,7 +99,7 @@ BOOL CDlgGrepReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { _SetHwnd( hwndDlg ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ), TRUE ); HFONT hFontOld = (HFONT)::SendMessageAny( GetItemHwnd( IDC_COMBO_TEXT2 ), WM_GETFONT, 0, 0 ); @@ -140,16 +140,16 @@ BOOL CDlgGrepReplace::OnBnClicked( int wID ) } } } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDlgGrep::OnBnClicked( wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgGrepReplace::SetData( void ) { - /* ’uŠ·Œã */ + /* ç½®æ›å¾Œ */ ::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT2, m_strText2.c_str() ); HWND hwndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ); for( int i = 0; i < m_pShareData->m_sSearchKeywords.m_aReplaceKeys.size(); ++i ){ @@ -164,14 +164,14 @@ void CDlgGrepReplace::SetData( void ) -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 - TRUE==³í FALSE==“ü—̓Gƒ‰[ +/*! ダイアログデータã®å–å¾— + TRUE==正常 FALSE==入力エラー */ int CDlgGrepReplace::GetData( void ) { m_bPaste = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHK_PASTE ); - /* ’uŠ·Œã */ + /* ç½®æ›å¾Œ */ int nBufferSize = ::GetWindowTextLength( GetItemHwnd(IDC_COMBO_TEXT2) ) + 1; std::vector vText(nBufferSize); ::DlgItem_GetText( GetHwnd(), IDC_COMBO_TEXT2, &vText[0], nBufferSize); diff --git a/sakura_core/dlg/CDlgGrepReplace.h b/sakura_core/dlg/CDlgGrepReplace.h index 8ead95fe16..9f51f08858 100644 --- a/sakura_core/dlg/CDlgGrepReplace.h +++ b/sakura_core/dlg/CDlgGrepReplace.h @@ -1,8 +1,8 @@ -/*! @file - @brief GREP’uŠ·ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief GREPç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author Norio Nakatani - @date 2011.12.15 CDlgFrep.h‚©‚çì¬ + @date 2011.12.15 CDlgFrep.hã‹ã‚‰ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -21,7 +21,7 @@ class CDlgGrep; #include "dlg/CDialog.h" #include "dlg/CDlgGrep.h" -//! GREP’uŠ·ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +//! GREPç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ class CDlgGrepReplace : public CDlgGrep { public: @@ -32,27 +32,27 @@ class CDlgGrepReplace : public CDlgGrep /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, const TCHAR*, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, const TCHAR*, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ bool m_bPaste; bool m_bBackup; - std::wstring m_strText2; //!< ’uŠ·Œã - int m_nReplaceKeySequence; //!< ’uŠ·ŒãƒV[ƒPƒ“ƒX + std::wstring m_strText2; //!< ç½®æ›å¾Œ + int m_nReplaceKeySequence; //!< ç½®æ›å¾Œã‚·ãƒ¼ã‚±ãƒ³ã‚¹ protected: CFontAutoDeleter m_cFontText2; /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnDestroy(); BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ }; diff --git a/sakura_core/dlg/CDlgInput1.cpp b/sakura_core/dlg/CDlgInput1.cpp index 8dc78d06de..48b208b1ec 100644 --- a/sakura_core/dlg/CDlgInput1.cpp +++ b/sakura_core/dlg/CDlgInput1.cpp @@ -1,8 +1,8 @@ -/*! @file - @brief 1s“ü—̓_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 1行入力ダイアログボックス @author Norio Nakatani - @date 1998/05/31 ì¬ + @date 1998/05/31 ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -21,18 +21,18 @@ #include "sakura_rc.h" #include "sakura.hh" -// “ü—Í CDlgInput1.cpp //@@@ 2002.01.07 add start MIK +// 入力 CDlgInput1.cpp //@@@ 2002.01.07 add start MIK static const DWORD p_helpids[] = { //13000 IDOK, HIDOK_DLG1, IDCANCEL, HIDCANCEL_DLG1, - IDC_EDIT_INPUT1, HIDC_DLG1_EDIT1, //“ü—̓tƒB[ƒ‹ƒh IDC_EDIT1->IDC_EDIT_INPUT1 2008/7/3 Uchi - IDC_STATIC_MSG, HIDC_DLG1_EDIT1, //ƒƒbƒZ[ƒW + IDC_EDIT_INPUT1, HIDC_DLG1_EDIT1, //入力フィールド IDC_EDIT1->IDC_EDIT_INPUT1 2008/7/3 Uchi + IDC_STATIC_MSG, HIDC_DLG1_EDIT1, //メッセージ // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK -/* ƒ_ƒCƒAƒƒOƒvƒƒV[ƒWƒƒ */ +/* ダイアログプロシージャ */ INT_PTR CALLBACK CDlgInput1Proc( HWND hwndDlg, // handle to dialog box UINT uMsg, // message @@ -76,7 +76,7 @@ CDlgInput1::~CDlgInput1() -/* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モードレスダイアログã®è¡¨ç¤º */ BOOL CDlgInput1::DoModal( HINSTANCE hInstApp, HWND hwndParent, @@ -87,12 +87,12 @@ BOOL CDlgInput1::DoModal( ) { BOOL bRet; - m_hInstance = hInstApp; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - m_hwndParent = hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ - m_pszTitle = pszTitle; /* ƒ_ƒCƒAƒƒOƒ^ƒCƒgƒ‹ */ - m_pszMessage = pszMessage; /* ƒƒbƒZ[ƒW */ - m_nMaxTextLen = nMaxTextLen; /* “ü—̓TƒCƒYãŒÀ */ -// m_pszText = pszText; /* ƒeƒLƒXƒg */ + m_hInstance = hInstApp; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + m_hwndParent = hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ + m_pszTitle = pszTitle; /* ダイアログタイトル */ + m_pszMessage = pszMessage; /* メッセージ */ + m_nMaxTextLen = nMaxTextLen; /* å…¥åŠ›ã‚µã‚¤ã‚ºä¸Šé™ */ +// m_pszText = pszText; /* テキスト */ m_cmemText.SetString( pszText ); bRet = (BOOL)::DialogBoxParam( CSelectLang::getLangRsrcInstance(), @@ -126,7 +126,7 @@ BOOL CDlgInput1::DoModal( -/* ƒ_ƒCƒAƒƒO‚̃ƒbƒZ[ƒWˆ— */ +/* ダイアログã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç† */ INT_PTR CDlgInput1::DispatchEvent( HWND hwndDlg, // handle to dialog box UINT uMsg, // message @@ -139,26 +139,26 @@ INT_PTR CDlgInput1::DispatchEvent( // int nRet; switch( uMsg ){ case WM_INITDIALOG: - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + /* ダイアログデータã®è¨­å®š */ // Modified by KEITA for WIN64 2003.9.6 ::SetWindowLongPtr( hwndDlg, DWLP_USER, lParam ); - ::SetWindowText( hwndDlg, m_pszTitle ); /* ƒ_ƒCƒAƒƒOƒ^ƒCƒgƒ‹ */ - EditCtl_LimitText( ::GetDlgItem( hwndDlg, IDC_EDIT_INPUT1 ), m_nMaxTextLen ); /* “ü—̓TƒCƒYãŒÀ */ - DlgItem_SetText( hwndDlg, IDC_EDIT_INPUT1, m_cmemText.GetStringPtr() ); /* ƒeƒLƒXƒg */ - ::SetWindowText( ::GetDlgItem( hwndDlg, IDC_STATIC_MSG ), m_pszMessage ); /* ƒƒbƒZ[ƒW */ + ::SetWindowText( hwndDlg, m_pszTitle ); /* ダイアログタイトル */ + EditCtl_LimitText( ::GetDlgItem( hwndDlg, IDC_EDIT_INPUT1 ), m_nMaxTextLen ); /* å…¥åŠ›ã‚µã‚¤ã‚ºä¸Šé™ */ + DlgItem_SetText( hwndDlg, IDC_EDIT_INPUT1, m_cmemText.GetStringPtr() ); /* テキスト */ + ::SetWindowText( ::GetDlgItem( hwndDlg, IDC_STATIC_MSG ), m_pszMessage ); /* メッセージ */ return TRUE; case WM_COMMAND: - wNotifyCode = HIWORD(wParam); /* ’Ê’mƒR[ƒh */ - wID = LOWORD(wParam); /* €–ÚID¤ ƒRƒ“ƒgƒ[ƒ‹ID¤ ‚Ü‚½‚̓AƒNƒZƒ‰ƒŒ[ƒ^ID */ + wNotifyCode = HIWORD(wParam); /* 通知コード */ + wID = LOWORD(wParam); /* é …ç›®ID〠コントロールID〠ã¾ãŸã¯ã‚¢ã‚¯ã‚»ãƒ©ãƒ¬ãƒ¼ã‚¿ID */ switch( wNotifyCode ){ - /* ƒ{ƒ^ƒ“^ƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚ªƒNƒŠƒbƒN‚³‚ꂽ */ + /* ボタンï¼ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ãŒã‚¯ãƒªãƒƒã‚¯ã•ã‚ŒãŸ */ case BN_CLICKED: switch( wID ){ case IDOK: m_cmemText.AllocStringBuffer( ::GetWindowTextLength( ::GetDlgItem( hwndDlg, IDC_EDIT_INPUT1 ) ) ); - ::GetWindowText( ::GetDlgItem( hwndDlg, IDC_EDIT_INPUT1 ), m_cmemText.GetStringPtr(), m_nMaxTextLen + 1 ); /* ƒeƒLƒXƒg */ + ::GetWindowText( ::GetDlgItem( hwndDlg, IDC_EDIT_INPUT1 ), m_cmemText.GetStringPtr(), m_nMaxTextLen + 1 ); /* テキスト */ ::EndDialog( hwndDlg, TRUE ); return TRUE; case IDCANCEL: @@ -172,13 +172,13 @@ INT_PTR CDlgInput1::DispatchEvent( case WM_HELP: { HELPINFO *p = (HELPINFO *)lParam; - MyWinHelp( (HWND)p->hItemHandle, HELP_WM_HELP, (ULONG_PTR)(LPVOID)p_helpids ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + MyWinHelp( (HWND)p->hItemHandle, HELP_WM_HELP, (ULONG_PTR)(LPVOID)p_helpids ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ } return TRUE; //Context Menu case WM_CONTEXTMENU: - MyWinHelp( hwndDlg, HELP_CONTEXTMENU, (ULONG_PTR)(LPVOID)p_helpids ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + MyWinHelp( hwndDlg, HELP_CONTEXTMENU, (ULONG_PTR)(LPVOID)p_helpids ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; //@@@ 2002.01.07 add end } diff --git a/sakura_core/dlg/CDlgInput1.h b/sakura_core/dlg/CDlgInput1.h index a09f7ef7be..d2e649c444 100644 --- a/sakura_core/dlg/CDlgInput1.h +++ b/sakura_core/dlg/CDlgInput1.h @@ -1,8 +1,8 @@ -/*! @file - @brief 1s“ü—̓_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 1行入力ダイアログボックス @author Norio Nakatani - @date 1998/05/31 ì¬ + @date 1998/05/31 ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -17,10 +17,10 @@ class CDlgInput1; #define _CDLGINPUT1_H_ /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ /*! - @brief ‚Ps“ü—̓_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief １行入力ダイアログボックス */ class CDlgInput1 { @@ -30,25 +30,25 @@ class CDlgInput1 */ CDlgInput1(); ~CDlgInput1(); - BOOL DoModal( HINSTANCE , HWND , const TCHAR* , const TCHAR* , int , TCHAR* ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - BOOL DoModal( HINSTANCE , HWND , const TCHAR* , const TCHAR* , int , NOT_TCHAR* ); /* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + BOOL DoModal( HINSTANCE , HWND , const TCHAR* , const TCHAR* , int , TCHAR* ); /* モードレスダイアログã®è¡¨ç¤º */ + BOOL DoModal( HINSTANCE , HWND , const TCHAR* , const TCHAR* , int , NOT_TCHAR* ); /* モードレスダイアログã®è¡¨ç¤º */ /* || Attributes & Operations */ - INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ƒ_ƒCƒAƒƒO‚̃ƒbƒZ[ƒWˆ— */ + INT_PTR DispatchEvent( HWND, UINT, WPARAM, LPARAM ); /* ダイアログã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç† */ - HINSTANCE m_hInstance; /* ƒAƒvƒŠƒP[ƒVƒ‡ƒ“ƒCƒ“ƒXƒ^ƒ“ƒX‚̃nƒ“ƒhƒ‹ */ - HWND m_hwndParent; /* ƒI[ƒi[ƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹ */ - HWND m_hWnd; /* ‚±‚̃_ƒCƒAƒƒO‚̃nƒ“ƒhƒ‹ */ + HINSTANCE m_hInstance; /* アプリケーションインスタンスã®ãƒãƒ³ãƒ‰ãƒ« */ + HWND m_hwndParent; /* オーナーウィンドウã®ãƒãƒ³ãƒ‰ãƒ« */ + HWND m_hWnd; /* ã“ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã®ãƒãƒ³ãƒ‰ãƒ« */ - const TCHAR* m_pszTitle; /* ƒ_ƒCƒAƒƒOƒ^ƒCƒgƒ‹ */ - const TCHAR* m_pszMessage; /* ƒƒbƒZ[ƒW */ - int m_nMaxTextLen; /* “ü—̓TƒCƒYãŒÀ */ -// char* m_pszText; /* ƒeƒLƒXƒg */ - CNativeT m_cmemText; /* ƒeƒLƒXƒg */ + const TCHAR* m_pszTitle; /* ダイアログタイトル */ + const TCHAR* m_pszMessage; /* メッセージ */ + int m_nMaxTextLen; /* å…¥åŠ›ã‚µã‚¤ã‚ºä¸Šé™ */ +// char* m_pszText; /* テキスト */ + CNativeT m_cmemText; /* テキスト */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ }; diff --git a/sakura_core/dlg/CDlgJump.cpp b/sakura_core/dlg/CDlgJump.cpp index 2fdc74f3cf..cfd83acddb 100644 --- a/sakura_core/dlg/CDlgJump.cpp +++ b/sakura_core/dlg/CDlgJump.cpp @@ -1,8 +1,8 @@ -/*! @file - @brief Žw’ès‚ւ̃Wƒƒƒ“ƒvƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 指定行ã¸ã®ã‚¸ãƒ£ãƒ³ãƒ—ダイアログボックス @author Norio Nakatani - @date 1998/05/31 ì¬ + @date 1998/05/31 ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -20,23 +20,23 @@ #include "doc/CEditDoc.h" #include "func/Funccode.h" // Stonee, 2001/03/12 #include "outline/CFuncInfo.h" -#include "outline/CFuncInfoArr.h"// 2002/2/10 aroka ƒwƒbƒ_®— +#include "outline/CFuncInfoArr.h"// 2002/2/10 aroka ãƒ˜ãƒƒãƒ€æ•´ç† #include "util/shell.h" #include "window/CEditWnd.h" #include "sakura_rc.h" #include "sakura.hh" -// ƒWƒƒƒ“ƒv CDlgJump.cpp //@@@ 2002.01.07 add start MIK +// ジャンプ CDlgJump.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12800 - IDC_BUTTON_JUMP, HIDC_JUMP_BUTTON_JUMP, //ƒWƒƒƒ“ƒv - IDCANCEL, HIDCANCEL_JUMP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_JUMP_BUTTON_HELP, //ƒwƒ‹ƒv + IDC_BUTTON_JUMP, HIDC_JUMP_BUTTON_JUMP, //ジャンプ + IDCANCEL, HIDCANCEL_JUMP, //キャンセル + IDC_BUTTON_HELP, HIDC_JUMP_BUTTON_HELP, //ヘルプ IDC_CHECK_PLSQL, HIDC_JUMP_CHECK_PLSQL, //PL/SQL IDC_COMBO_PLSQLBLOCKS, HIDC_JUMP_COMBO_PLSQLBLOCKS, // - IDC_EDIT_LINENUM, HIDC_JUMP_EDIT_LINENUM, //s”Ô† + IDC_EDIT_LINENUM, HIDC_JUMP_EDIT_LINENUM, //è¡Œç•ªå· IDC_EDIT_PLSQL_E1, HIDC_JUMP_EDIT_PLSQL_E1, // - IDC_RADIO_LINENUM_LAYOUT, HIDC_JUMP_RADIO_LINENUM_LAYOUT, //Ü‚è•Ô‚µ’PˆÊ - IDC_RADIO_LINENUM_CRLF, HIDC_JUMP_RADIO_LINENUM_CRLF, //‰üs’PˆÊ + IDC_RADIO_LINENUM_LAYOUT, HIDC_JUMP_RADIO_LINENUM_LAYOUT, //折り返ã—å˜ä½ + IDC_RADIO_LINENUM_CRLF, HIDC_JUMP_RADIO_LINENUM_CRLF, //改行å˜ä½ IDC_SPIN_LINENUM, HIDC_JUMP_EDIT_LINENUM, //12870, // IDC_SPIN_PLSQL_E1, HIDC_JUMP_EDIT_PLSQL_E1, //12871, // // IDC_STATIC, -1, @@ -45,8 +45,8 @@ const DWORD p_helpids[] = { //12800 CDlgJump::CDlgJump() { - m_nLineNum = 0; /* s”Ô† */ - m_bPLSQL = FALSE; /* PL/SQLƒ\[ƒX‚Ì—LŒøs‚© */ + m_nLineNum = 0; /* è¡Œç•ªå· */ + m_bPLSQL = FALSE; /* PL/SQLソースã®æœ‰åŠ¹è¡Œã‹ */ m_nPLSQL_E1 = 1; m_nPLSQL_E2 = 1; @@ -54,7 +54,7 @@ CDlgJump::CDlgJump() return; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgJump::DoModal( HINSTANCE hInstance, HWND hwndParent, @@ -65,8 +65,8 @@ int CDlgJump::DoModal( } -// From Here Oct. 6, 2000 JEPRO added s”Ô†“ü—̓{ƒbƒNƒX‚ɃXƒsƒ“ƒRƒ“ƒgƒ[ƒ‹‚ð•t‚¯‚邽‚ß -// CDlgPrintSetting.cpp‚ÌOnNotify‚ÆOnSpin‹y‚ÑCpropComFile.cpp‚ÌDispatchEvent_p2“à‚Ìcase WM_NOTIFY‚ðŽQl‚É‚µ‚½ +// From Here Oct. 6, 2000 JEPRO added 行番å·å…¥åŠ›ãƒœãƒƒã‚¯ã‚¹ã«ã‚¹ãƒ”ンコントロールを付ã‘ã‚‹ãŸã‚ +// CDlgPrintSetting.cppã®OnNotifyã¨OnSpinåŠã³CpropComFile.cppã®DispatchEvent_p2内ã®case WM_NOTIFYã‚’å‚考ã«ã—㟠BOOL CDlgJump::OnNotify( WPARAM wParam, LPARAM lParam ) { NM_UPDOWN* pMNUD; @@ -74,10 +74,10 @@ BOOL CDlgJump::OnNotify( WPARAM wParam, LPARAM lParam ) int nData; idCtrl = (int)wParam; pMNUD = (NM_UPDOWN*)lParam; -/* ƒXƒsƒ“ƒRƒ“ƒgƒ[ƒ‹‚̈— */ +/* スピンコントロールã®å‡¦ç† */ switch( idCtrl ){ case IDC_SPIN_LINENUM: - /* ƒWƒƒƒ“ƒv‚µ‚½‚¢s”Ô†‚ÌŽw’è */ + /* ジャンプã—ãŸã„行番å·ã®æŒ‡å®š */ nData = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_LINENUM, NULL, FALSE ); if( pMNUD->iDelta < 0 ){ ++nData; @@ -129,11 +129,11 @@ BOOL CDlgJump::OnBnClicked( int wID ) { switch( wID ){ case IDC_BUTTON_HELP: - /* uŽw’ès‚ÖƒWƒƒƒ“ƒvv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_JUMP_DIALOG) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「指定行ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_JUMP_DIALOG) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDC_CHECK_PLSQL: /* PL/SQLƒ\[ƒX‚Ì—LŒøs‚© */ + case IDC_CHECK_PLSQL: /* PL/SQLソースã®æœ‰åŠ¹è¡Œã‹ */ if( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_PLSQL ) ){ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LABEL_PLSQL1 ), TRUE ); //Sept. 12, 2000 JEPRO ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LABEL_PLSQL2 ), TRUE ); //Sept. 12, 2000 JEPRO @@ -154,7 +154,7 @@ BOOL CDlgJump::OnBnClicked( int wID ) ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_LINENUM_LAYOUT ), TRUE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_LINENUM_CRLF ), TRUE ); } - /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ ::CheckDlgButton( GetHwnd(), IDC_RADIO_LINENUM_LAYOUT, FALSE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_LINENUM_CRLF, TRUE ); @@ -163,33 +163,33 @@ BOOL CDlgJump::OnBnClicked( int wID ) ::CheckDlgButton( GetHwnd(), IDC_RADIO_LINENUM_CRLF, FALSE ); } return TRUE; - case IDC_BUTTON_JUMP: /* Žw’ès‚ÖƒWƒƒƒ“ƒv */ //Feb. 20, 2001 JEPRO ƒ{ƒ^ƒ“–¼‚ð[IDOK]¨[IDC_BUTTON_JUMP]‚É•ÏX - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - //From Here Feb. 20, 2001 JEPRO ŽŸs‚ðƒRƒƒ“ƒgƒAƒEƒg (CEditView_Command.cpp ‚Ì Command_JUMP ‚àŠÖŒW‚µ‚Ä‚¢‚é‚Ì‚ÅŽQÆ‚Ì‚±‚Æ) + case IDC_BUTTON_JUMP: /* 指定行ã¸ã‚¸ãƒ£ãƒ³ãƒ— */ //Feb. 20, 2001 JEPRO ボタンåã‚’[IDOK]→[IDC_BUTTON_JUMP]ã«å¤‰æ›´ + /* ダイアログデータã®å–å¾— */ + //From Here Feb. 20, 2001 JEPRO 次行をコメントアウト (CEditView_Command.cpp ã® Command_JUMP も関係ã—ã¦ã„ã‚‹ã®ã§å‚ç…§ã®ã“ã¨) // ::EndDialog( GetHwnd(), GetData() ); -// ŽŸs‚©‚ç’ljÁ +// 次行ã‹ã‚‰è¿½åŠ  if( 0 < GetData() ){ CloseDialog( 1 ); }else{ OkMessage( GetHwnd(), LS(STR_DLGJUMP1) ); } //To Here Feb. 20, 2001 - { //@@@ 2002.2.2 YAZAKI Žw’ès‚ÖƒWƒƒƒ“ƒv‚ðAƒ_ƒCƒAƒƒO‚ð•\Ž¦‚·‚éƒRƒ}ƒ“ƒh‚ÆAŽÀۂɃWƒƒƒ“ƒv‚·‚éƒRƒ}ƒ“ƒh‚É•ª—£B + { //@@@ 2002.2.2 YAZAKI 指定行ã¸ã‚¸ãƒ£ãƒ³ãƒ—ã‚’ã€ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’表示ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã¨ã€å®Ÿéš›ã«ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã«åˆ†é›¢ã€‚ CEditDoc* pCEditDoc = (CEditDoc*)m_lParam; - pCEditDoc->m_pcEditWnd->GetActiveView().GetCommander().HandleCommand(F_JUMP, true, 0, 0, 0, 0); // ƒWƒƒƒ“ƒvƒRƒ}ƒ“ƒh”­s + pCEditDoc->m_pcEditWnd->GetActiveView().GetCommander().HandleCommand(F_JUMP, true, 0, 0, 0, 0); // ジャンプコマンド発行 } return TRUE; case IDCANCEL: ::EndDialog( GetHwnd(), FALSE ); return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgJump::SetData( void ) { CEditDoc* pCEditDoc = (CEditDoc*)m_lParam; @@ -197,26 +197,26 @@ void CDlgJump::SetData( void ) int i; HWND hwndCtrl; wchar_t szText[1024]; - int nIndexCurSel = 0; // Sep. 11, 2004 genta ‰Šú‰» + int nIndexCurSel = 0; // Sep. 11, 2004 genta åˆæœŸåŒ– int nIndex; - int nWorkLine; //$$ ðŒ‚É‚æ‚èAƒŒƒCƒAƒEƒgEƒƒWƒbƒN‚Ì’PˆÊ‚ª¬Ý‚·‚邽‚ßAƒ~ƒX‚ÌŒ´ˆö‚É‚È‚è‚â‚·‚¢ + int nWorkLine; //$$ æ¡ä»¶ã«ã‚ˆã‚Šã€ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆãƒ»ãƒ­ã‚¸ãƒƒã‚¯ã®å˜ä½ãŒæ··åœ¨ã™ã‚‹ãŸã‚ã€ãƒŸã‚¹ã®åŽŸå› ã«ãªã‚Šã‚„ã™ã„ int nPLSQLBlockNum; // GetHwnd() = hwndDlg; -//From Here Oct. 7, 2000 JEPRO ‘O‰ñ“ü—Í‚µ‚½s”Ô†‚ð•ÛŽ‚·‚é‚悤‚ɉºs‚ð•ÏX -// ::DlgItem_SetText( GetHwnd(), IDC_EDIT_LINENUM, "" ); /* s”Ô† */ +//From Here Oct. 7, 2000 JEPRO å‰å›žå…¥åŠ›ã—ãŸè¡Œç•ªå·ã‚’ä¿æŒã™ã‚‹ã‚ˆã†ã«ä¸‹è¡Œã‚’変更 +// ::DlgItem_SetText( GetHwnd(), IDC_EDIT_LINENUM, "" ); /* è¡Œç•ªå· */ if( 0 == m_nLineNum ){ - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_LINENUM, _T("") ); /* s”Ô† */ + ::DlgItem_SetText( GetHwnd(), IDC_EDIT_LINENUM, _T("") ); /* è¡Œç•ªå· */ }else{ - ::SetDlgItemInt( GetHwnd(), IDC_EDIT_LINENUM, m_nLineNum, FALSE ); /* ‘O‰ñ‚Ìs”Ô† */ + ::SetDlgItemInt( GetHwnd(), IDC_EDIT_LINENUM, m_nLineNum, FALSE ); /* å‰å›žã®è¡Œç•ªå· */ } //To Here Oct. 7, 2000 ::SetDlgItemInt( GetHwnd(), IDC_EDIT_PLSQL_E1, m_nPLSQL_E1, FALSE ); - /* PL/SQLŠÖ”ƒŠƒXƒgì¬ */ + /* PL/SQLé–¢æ•°ãƒªã‚¹ãƒˆä½œæˆ */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_PLSQLBLOCKS ); -/* ƒ^ƒCƒv•Ê‚Éݒ肳‚ꂽƒAƒEƒgƒ‰ƒCƒ“‰ðÍ•û–@ */ +/* タイプ別ã«è¨­å®šã•ã‚ŒãŸã‚¢ã‚¦ãƒˆãƒ©ã‚¤ãƒ³è§£æžæ–¹æ³• */ if( OUTLINE_PLSQL == pCEditDoc->m_cDocType.GetDocumentAttribute().m_eDefaultOutline ){ pCEditDoc->m_cDocOutline.MakeFuncList_PLSQL( &cFuncInfoArr ); } @@ -228,7 +228,7 @@ void CDlgJump::SetData( void ) 41 == cFuncInfoArr.GetAt( i )->m_nInfo ){ } if( 31 == cFuncInfoArr.GetAt( i )->m_nInfo ){ - if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ auto_sprintf( szText, LSW(STR_DLGJUMP_PSLQL), cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF, cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr() @@ -240,7 +240,7 @@ void CDlgJump::SetData( void ) ); } nIndex = Combo_AddString( hwndCtrl, szText ); - if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF ); } else{ @@ -249,7 +249,7 @@ void CDlgJump::SetData( void ) nPLSQLBlockNum++; } if( 41 == cFuncInfoArr.GetAt( i )->m_nInfo ){ - if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ auto_sprintf( szText, LSW(STR_DLGJUMP_PSLQL), cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF, cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr() @@ -261,7 +261,7 @@ void CDlgJump::SetData( void ) ); } nIndexCurSel = nIndex = Combo_AddString( hwndCtrl, szText ); - if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ nWorkLine = (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF; Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF ); }else{ @@ -273,16 +273,16 @@ void CDlgJump::SetData( void ) } Combo_SetCurSel( hwndCtrl, nIndexCurSel ); - /* PL/SQL‚̃pƒbƒP[ƒW–{‘Ì‚ªŒŸo‚³‚ê‚½ê‡ */ + /* PL/SQLã®ãƒ‘ッケージ本体ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆ */ if( -1 != nWorkLine ){ m_nPLSQL_E1 = nWorkLine; ::SetDlgItemInt( GetHwnd(), IDC_EDIT_PLSQL_E1, m_nPLSQL_E1, FALSE ); } - /* PL/SQL‚̃pƒbƒP[ƒWƒuƒƒbƒN‚ªŒŸo‚³‚ê‚½ê‡ */ + /* PL/SQLã®ãƒ‘ッケージブロックãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆ */ if( 0 < nPLSQLBlockNum ){ m_bPLSQL = TRUE; } - ::CheckDlgButton( GetHwnd(), IDC_CHECK_PLSQL, m_bPLSQL ); /* PL/SQLƒ\[ƒX‚Ì—LŒøs‚© */ + ::CheckDlgButton( GetHwnd(), IDC_CHECK_PLSQL, m_bPLSQL ); /* PL/SQLソースã®æœ‰åŠ¹è¡Œã‹ */ if( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_PLSQL ) ){ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LABEL_PLSQL1 ), TRUE ); //Sept. 12, 2000 JEPRO ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_LABEL_PLSQL2 ), TRUE ); //Sept. 12, 2000 JEPRO @@ -303,7 +303,7 @@ void CDlgJump::SetData( void ) ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_LINENUM_LAYOUT ), TRUE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_RADIO_LINENUM_CRLF ), TRUE ); } - /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ ::CheckDlgButton( GetHwnd(), IDC_RADIO_LINENUM_LAYOUT, FALSE ); ::CheckDlgButton( GetHwnd(), IDC_RADIO_LINENUM_CRLF, TRUE ); @@ -317,20 +317,20 @@ void CDlgJump::SetData( void ) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgJump::GetData( void ) { BOOL pTranslated; - /* s”Ô†‚Ì•\Ž¦ false=Ü‚è•Ô‚µ’PˆÊ^true=‰üs’PˆÊ */ + /* 行番å·ã®è¡¨ç¤º false=折り返ã—å˜ä½ï¼true=改行å˜ä½ */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_LINENUM_LAYOUT ) ){ m_pShareData->m_bLineNumIsCRLF_ForJump = false; }else{ m_pShareData->m_bLineNumIsCRLF_ForJump = true; } - /* PL/SQLƒ\[ƒX‚Ì—LŒøs‚© */ + /* PL/SQLソースã®æœ‰åŠ¹è¡Œã‹ */ m_bPLSQL = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_PLSQL ); m_nPLSQL_E1 = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_PLSQL_E1, &pTranslated, FALSE ); if( m_nPLSQL_E1 == 0 && !pTranslated ){ @@ -342,7 +342,7 @@ int CDlgJump::GetData( void ) // m_nPLSQL_E2 = 1; // } - /* s”Ô† */ + /* è¡Œç•ªå· */ m_nLineNum = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_LINENUM, &pTranslated, FALSE ); if( m_nLineNum == 0 && !pTranslated ){ return FALSE; diff --git a/sakura_core/dlg/CDlgJump.h b/sakura_core/dlg/CDlgJump.h index 636c05b6c1..24b6e72922 100644 --- a/sakura_core/dlg/CDlgJump.h +++ b/sakura_core/dlg/CDlgJump.h @@ -1,9 +1,9 @@ -/*! @file - @brief Žw’ès‚ւ̃Wƒƒƒ“ƒvƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 指定行ã¸ã®ã‚¸ãƒ£ãƒ³ãƒ—ダイアログボックス @author Norio Nakatani - @date 1998/05/31 ì¬ - @date 1999/12/05 Äì¬ + @date 1998/05/31 ä½œæˆ + @date 1999/12/05 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -20,7 +20,7 @@ class CDlgJump; #define _CDLGJUMP_H_ #include "dlg/CDialog.h" -//! Žw’ès‚ւ̃Wƒƒƒ“ƒvƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +//! 指定行ã¸ã®ã‚¸ãƒ£ãƒ³ãƒ—ダイアログボックス class CDlgJump : public CDialog { public: @@ -31,22 +31,22 @@ class CDlgJump : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ - int m_nLineNum; /*!< s”Ô† */ - BOOL m_bPLSQL; /*!< PL/SQLƒ\[ƒX‚Ì—LŒøs‚© */ + int m_nLineNum; /*!< è¡Œç•ªå· */ + BOOL m_bPLSQL; /*!< PL/SQLソースã®æœ‰åŠ¹è¡Œã‹ */ int m_nPLSQL_E1; int m_nPLSQL_E2; protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnNotify( WPARAM, LPARAM ); // Oct. 6, 2000 JEPRO added for Spin control BOOL OnCbnSelChange( HWND, int ); BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ }; diff --git a/sakura_core/dlg/CDlgOpenFile.h b/sakura_core/dlg/CDlgOpenFile.h index 4a9648b440..0a8af26a7e 100644 --- a/sakura_core/dlg/CDlgOpenFile.h +++ b/sakura_core/dlg/CDlgOpenFile.h @@ -1,8 +1,8 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief ファイルオープンダイアログボックス @author Norio Nakatani - @date 1998/08/10 ì¬ + @date 1998/08/10 ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -32,22 +32,22 @@ struct SSaveInfo; // doc/CDocListener.h struct OPENFILENAMEZ; class CDlgOpenFileMem; -/*! ƒtƒBƒ‹ƒ^Ý’è */ +/*! フィルタ設定 */ enum EFilter { - EFITER_NONE, //!< ‚È‚µ - EFITER_TEXT, //!< ƒeƒLƒXƒg - EFITER_MACRO, //!< ƒ}ƒNƒ + EFITER_NONE, //!< ãªã— + EFITER_TEXT, //!< テキスト + EFITER_MACRO, //!< マクロ EFITER_MAX, }; -/*! ƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! ファイルオープンダイアログボックス - @date 2002.2.17 YAZAKI CShareData‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ÍACProcess‚ɂЂƂ‚ ‚é‚Ì‚ÝB + @date 2002.2.17 YAZAKI CShareDataã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€CProcessã«ã²ã¨ã¤ã‚ã‚‹ã®ã¿ã€‚ */ class CDlgOpenFile { public: - //ƒRƒ“ƒXƒgƒ‰ƒNƒ^EƒfƒXƒgƒ‰ƒNƒ^ + //コンストラクタ・デストラクタ CDlgOpenFile(); ~CDlgOpenFile(); void Create( @@ -59,38 +59,38 @@ class CDlgOpenFile const std::vector& vOPENFOLDER = std::vector() ); - //‘€ì - bool DoModal_GetOpenFileName( TCHAR*, EFilter eAddFileter = EFITER_TEXT ); /* ŠJ‚­ƒ_ƒCƒAƒƒO ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ //2002/08/21 moca ˆø”’ljÁ - bool DoModal_GetSaveFileName( TCHAR* ); /* •Û‘¶ƒ_ƒCƒAƒƒO ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ //2002/08/21 30,2002 moca ˆø”’ljÁ - bool DoModalOpenDlg( SLoadInfo* pLoadInfo, std::vector*, bool bOptions = true ); /* ŠJ‚­ƒ_ƒCƒAƒO ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - bool DoModalSaveDlg( SSaveInfo* pSaveInfo, bool bSimpleMode ); /* •Û‘¶ƒ_ƒCƒAƒƒO ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + //æ“作 + bool DoModal_GetOpenFileName( TCHAR*, EFilter eAddFileter = EFITER_TEXT ); /* é–‹ãダイアログ モーダルダイアログã®è¡¨ç¤º */ //2002/08/21 moca 引数追加 + bool DoModal_GetSaveFileName( TCHAR* ); /* ä¿å­˜ãƒ€ã‚¤ã‚¢ãƒ­ã‚° モーダルダイアログã®è¡¨ç¤º */ //2002/08/21 30,2002 moca 引数追加 + bool DoModalOpenDlg( SLoadInfo* pLoadInfo, std::vector*, bool bOptions = true ); /* é–‹ãダイアグ モーダルダイアログã®è¡¨ç¤º */ + bool DoModalSaveDlg( SSaveInfo* pSaveInfo, bool bSimpleMode ); /* ä¿å­˜ãƒ€ã‚¤ã‚¢ãƒ­ã‚° モーダルダイアログã®è¡¨ç¤º */ protected: CDlgOpenFileMem* m_mem; /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ - // May 29, 2004 genta ƒGƒ‰[ˆ—‚ð‚Ü‚Æ‚ß‚é (advised by MIK) + // May 29, 2004 genta エラー処ç†ã‚’ã¾ã¨ã‚ã‚‹ (advised by MIK) void DlgOpenFail(void); - // 2005.11.02 ryoji OS ƒo[ƒWƒ‡ƒ“‘Ήž‚Ì OPENFILENAME ‰Šú‰»—pŠÖ” + // 2005.11.02 ryoji OS ãƒãƒ¼ã‚¸ãƒ§ãƒ³å¯¾å¿œã® OPENFILENAME åˆæœŸåŒ–用関数 void InitOfn( OPENFILENAMEZ* ); - // 2005.11.02 ryoji ‰ŠúƒŒƒCƒAƒEƒgݒ舗 + // 2005.11.02 ryoji åˆæœŸãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆè¨­å®šå‡¦ç† static void InitLayout( HWND hwndOpenDlg, HWND hwndDlg, HWND hwndBaseCtrl ); - // 2006.09.03 Moca ƒtƒ@ƒCƒ‹ƒ_ƒCƒAƒƒO‚̃Gƒ‰[‰ñ”ð - //! ƒŠƒgƒ‰ƒC‹@”\•t‚« GetOpenFileName + // 2006.09.03 Moca ファイルダイアログã®ã‚¨ãƒ©ãƒ¼å›žé¿ + //! リトライ機能付ã GetOpenFileName bool _GetOpenFileNameRecover( OPENFILENAMEZ* ofn ); - //! ƒŠƒgƒ‰ƒC‹@”\•t‚« GetOpenFileName + //! リトライ機能付ã GetOpenFileName bool GetSaveFileNameRecover( OPENFILENAMEZ* ofn ); friend UINT_PTR CALLBACK OFNHookProc( HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam ); public: - // Ý’èƒtƒHƒ‹ƒ_‘Š‘΃tƒ@ƒCƒ‹‘I‘ð(‹¤—Lƒf[ƒ^,iniˆÊ’uˆË‘¶) + // 設定フォルダ相対ファイルé¸æŠž(共有データ,iniä½ç½®ä¾å­˜) static BOOL SelectFile(HWND parent, HWND hwndCtl, const TCHAR* filter, bool resolvePath, EFilter eAddFilter = EFITER_TEXT); private: diff --git a/sakura_core/dlg/CDlgPluginOption.h b/sakura_core/dlg/CDlgPluginOption.h index 3e5684c238..b5e3d953f0 100644 --- a/sakura_core/dlg/CDlgPluginOption.h +++ b/sakura_core/dlg/CDlgPluginOption.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒvƒ‰ƒOƒCƒ“Ý’èƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief プラグイン設定ダイアログボックス @author Uchi @date 2010/3/22 @@ -35,18 +35,18 @@ class CPropPlugin; -/*! @brief uƒvƒ‰ƒOƒCƒ“Ý’èvƒ_ƒCƒAƒƒO +/*! @brief 「プラグイン設定ã€ãƒ€ã‚¤ã‚¢ãƒ­ã‚° - ‹¤’ÊÝ’è‚̃vƒ‰ƒOƒCƒ“Ý’è‚ÅCŽw’èƒvƒ‰ƒOƒCƒ“‚̃IƒvƒVƒ‡ƒ“‚ðÝ’è‚·‚邽‚ß‚É - Žg—p‚³‚ê‚éƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + 共通設定ã®ãƒ—ラグイン設定ã§ï¼ŒæŒ‡å®šãƒ—ラグインã®ã‚ªãƒ—ションを設定ã™ã‚‹ãŸã‚ã« + 使用ã•ã‚Œã‚‹ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ */ -// •ÒWÅ‘å’· +// 編集最大長 #define MAX_LENGTH_VALUE 1024 typedef std::wstring wstring; -// Œ^ +// åž‹ static const wstring OPTION_TYPE_BOOL = wstring( L"bool" ); static const wstring OPTION_TYPE_INT = wstring( L"int" ); static const wstring OPTION_TYPE_SEL = wstring( L"sel" ); @@ -64,11 +64,11 @@ class CDlgPluginOption : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, CPropPlugin*, int ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, CPropPlugin*, int ); /* モーダルダイアログã®è¡¨ç¤º */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ); BOOL OnBnClicked( int ); @@ -78,23 +78,23 @@ class CDlgPluginOption : public CDialog BOOL OnActivate( WPARAM wParam, LPARAM lParam ); LPVOID GetHelpIdTable( void ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ - void ChangeListPosition( void ); // •ÒW—̈æ‚ðƒŠƒXƒgƒrƒ…[‚ɇ‚¹‚ÄØ‘Ö‚¦‚é - void MoveFocusToEdit( void ); // •ÒW—̈æ‚ɃtƒH[ƒJƒX‚ðˆÚ‚· + void ChangeListPosition( void ); // 編集領域をリストビューã«åˆã›ã¦åˆ‡æ›¿ãˆã‚‹ + void MoveFocusToEdit( void ); // 編集領域ã«ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ã‚’移㙠void SetToEdit( int ); void SetFromEdit( int ); - void SelectEdit( int ); // •ÒW—̈æ‚ÌØ‚è‘Ö‚¦ - void SepSelect( wstring, wstring*, wstring* ); // ‘I‘ð—p•¶Žš—ñ•ª‰ð - void SelectDirectory( int iLine ); // ƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚·‚é + void SelectEdit( int ); // 編集領域ã®åˆ‡ã‚Šæ›¿ãˆ + void SepSelect( wstring, wstring*, wstring* ); // é¸æŠžç”¨æ–‡å­—列分解 + void SelectDirectory( int iLine ); // ディレクトリをé¸æŠžã™ã‚‹ private: CPlugin* m_cPlugin; CPropPlugin* m_cPropPlugin; - int m_ID; // ƒvƒ‰ƒOƒCƒ“”Ô†iƒGƒfƒBƒ^‚ª‚Ó‚é”Ô†j - int m_Line; // Œ»Ý•ÒW’†‚̃IƒvƒVƒ‡ƒ“s”Ô† - std::tstring m_sReadMeName; // ReadMe ƒtƒ@ƒCƒ‹–¼ + int m_ID; // プラグイン番å·ï¼ˆã‚¨ãƒ‡ã‚£ã‚¿ãŒãµã‚‹ç•ªå·ï¼‰ + int m_Line; // ç¾åœ¨ç·¨é›†ä¸­ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³è¡Œç•ªå· + std::tstring m_sReadMeName; // ReadMe ファイルå }; #endif /* SAKURA_CDLGPLUGINOPTION_7BD4A901_BC40_4CA1_8311_85B8CAA783F08_H_ */ diff --git a/sakura_core/dlg/CDlgPrintSetting.cpp b/sakura_core/dlg/CDlgPrintSetting.cpp index bb374a1b1a..d71a414119 100644 --- a/sakura_core/dlg/CDlgPrintSetting.cpp +++ b/sakura_core/dlg/CDlgPrintSetting.cpp @@ -1,16 +1,16 @@ -/*! @file - @brief ˆóüÝ’èƒ_ƒCƒAƒƒO +/*! @file + @brief å°åˆ·è¨­å®šãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Norio Nakatani - @date 2006.08.14 Moca —pŽ†•ûŒüƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ð”pŽ~‚µAƒ{ƒ^ƒ“‚ð—LŒø‰»D - —pŽ†–¼ˆê——‚Ìd•¡íœD + @date 2006.08.14 Moca 用紙方å‘コンボボックスを廃止ã—ã€ãƒœã‚¿ãƒ³ã‚’有効化． + 用紙å一覧ã®é‡è¤‡å‰Šé™¤ï¼Ž */ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, hor, Stonee Copyright (C) 2002, MIK, aroka, YAZAKI - Copyright (C) 2003, ‚©‚ë‚Æ + Copyright (C) 2003, ã‹ã‚㨠Copyright (C) 2006, ryoji This software is provided 'as-is', without any express or implied @@ -42,51 +42,51 @@ #include "sakura_rc.h" // 2002/2/10 aroka #include "sakura.hh" -// ˆóüÝ’è CDlgPrintSetting.cpp //@@@ 2002.01.07 add start MIK +// å°åˆ·è¨­å®š CDlgPrintSetting.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //12500 - IDC_COMBO_SETTINGNAME, HIDC_PS_COMBO_SETTINGNAME, //ƒy[ƒWÝ’è - IDC_BUTTON_EDITSETTINGNAME, HIDC_PS_BUTTON_EDITSETTINGNAME, //Ý’è–¼•ÏX - IDC_COMBO_FONT_HAN, HIDC_PS_COMBO_FONT_HAN, //”¼ŠpƒtƒHƒ“ƒg - IDC_COMBO_FONT_ZEN, HIDC_PS_COMBO_FONT_ZEN, //‘SŠpƒtƒHƒ“ƒg - IDC_EDIT_FONTHEIGHT, HIDC_PS_EDIT_FONTHEIGHT, //ƒtƒHƒ“ƒg‚ + IDC_COMBO_SETTINGNAME, HIDC_PS_COMBO_SETTINGNAME, //ページ設定 + IDC_BUTTON_EDITSETTINGNAME, HIDC_PS_BUTTON_EDITSETTINGNAME, //設定å変更 + IDC_COMBO_FONT_HAN, HIDC_PS_COMBO_FONT_HAN, //åŠè§’フォント + IDC_COMBO_FONT_ZEN, HIDC_PS_COMBO_FONT_ZEN, //全角フォント + IDC_EDIT_FONTHEIGHT, HIDC_PS_EDIT_FONTHEIGHT, //フォント高 IDC_SPIN_FONTHEIGHT, HIDC_PS_EDIT_FONTHEIGHT, //12570, IDC_SPIN_LINESPACE, HIDC_PS_EDIT_LINESPACE, //12571, - IDC_EDIT_LINESPACE, HIDC_PS_EDIT_LINESPACE, //s‘—‚è - IDC_EDIT_DANSUU, HIDC_PS_EDIT_DANSUU, //’i” + IDC_EDIT_LINESPACE, HIDC_PS_EDIT_LINESPACE, //è¡Œé€ã‚Š + IDC_EDIT_DANSUU, HIDC_PS_EDIT_DANSUU, //段数 IDC_SPIN_DANSUU, HIDC_PS_EDIT_DANSUU, //12572, - IDC_EDIT_DANSPACE, HIDC_PS_EDIT_DANSPACE, //’i‚ÌŒ„ŠÔ + IDC_EDIT_DANSPACE, HIDC_PS_EDIT_DANSPACE, //段ã®éš™é–“ IDC_SPIN_DANSPACE, HIDC_PS_EDIT_DANSPACE, //12573, - IDC_COMBO_PAPER, HIDC_PS_COMBO_PAPER, //—pŽ†ƒTƒCƒY - IDC_RADIO_PORTRAIT, HIDC_PS_STATIC_PAPERORIENT, //‰¡Œü‚« - IDC_RADIO_LANDSCAPE, HIDC_PS_STATIC_PAPERORIENT, //cŒü‚« - IDC_EDIT_MARGINTY, HIDC_PS_EDIT_MARGINTY, //—]”’ã + IDC_COMBO_PAPER, HIDC_PS_COMBO_PAPER, //用紙サイズ + IDC_RADIO_PORTRAIT, HIDC_PS_STATIC_PAPERORIENT, //横å‘ã + IDC_RADIO_LANDSCAPE, HIDC_PS_STATIC_PAPERORIENT, //縦å‘ã + IDC_EDIT_MARGINTY, HIDC_PS_EDIT_MARGINTY, //余白上 IDC_SPIN_MARGINTY, HIDC_PS_EDIT_MARGINTY, //12574, - IDC_EDIT_MARGINBY, HIDC_PS_EDIT_MARGINBY, //—]”’‰º + IDC_EDIT_MARGINBY, HIDC_PS_EDIT_MARGINBY, //余白下 IDC_SPIN_MARGINBY, HIDC_PS_EDIT_MARGINBY, //12575, - IDC_EDIT_MARGINLX, HIDC_PS_EDIT_MARGINLX, //—]”’¶ + IDC_EDIT_MARGINLX, HIDC_PS_EDIT_MARGINLX, //余白左 IDC_SPIN_MARGINLX, HIDC_PS_EDIT_MARGINLX, //12576, - IDC_EDIT_MARGINRX, HIDC_PS_EDIT_MARGINRX, //—]”’‰E + IDC_EDIT_MARGINRX, HIDC_PS_EDIT_MARGINRX, //ä½™ç™½å³ IDC_SPIN_MARGINRX, HIDC_PS_EDIT_MARGINRX, //12577, - IDC_CHECK_WORDWRAP, HIDC_PS_CHECK_WORDWRAP, //ƒ[ƒhƒ‰ƒbƒv - IDC_CHECK_LINENUMBER, HIDC_PS_CHECK_LINENUMBER, //s”Ô† - IDC_CHECK_PS_KINSOKUHEAD, HIDC_PS_CHECK_KINSOKUHEAD, //s“ª‹Ö‘¥ //@@@ 2002.04.09 MIK - IDC_CHECK_PS_KINSOKUTAIL, HIDC_PS_CHECK_KINSOKUTAIL, //s––‹Ö‘¥ //@@@ 2002.04.09 MIK - IDC_CHECK_PS_KINSOKURET, HIDC_PS_CHECK_KINSOKURET, //‰üs•¶Žš‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.14 MIK - IDC_CHECK_PS_KINSOKUKUTO, HIDC_PS_CHECK_KINSOKUKUTO, //‹å“Ç“_‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.17 MIK - IDC_CHECK_COLORPRINT, HIDC_PS_CHECK_COLORPRINT, //ƒJƒ‰[ˆóü // 2013/4/26 Uchi - IDC_EDIT_HEAD1, HIDC_PS_EDIT_HEAD1, //ƒwƒbƒ_[(¶Šñ‚¹) // 2006.10.11 ryoji - IDC_EDIT_HEAD2, HIDC_PS_EDIT_HEAD2, //ƒwƒbƒ_[(’†‰›Šñ‚¹) // 2006.10.11 ryoji - IDC_EDIT_HEAD3, HIDC_PS_EDIT_HEAD3, //ƒwƒbƒ_[(‰EŠñ‚¹) // 2006.10.11 ryoji - IDC_EDIT_FOOT1, HIDC_PS_EDIT_FOOT1, //ƒtƒbƒ^[(¶Šñ‚¹) // 2006.10.11 ryoji - IDC_EDIT_FOOT2, HIDC_PS_EDIT_FOOT2, //ƒtƒbƒ^[(’†‰›Šñ‚¹) // 2006.10.11 ryoji - IDC_EDIT_FOOT3, HIDC_PS_EDIT_FOOT3, //ƒtƒbƒ^[(‰EŠñ‚¹) // 2006.10.11 ryoji - IDC_CHECK_USE_FONT_HEAD, HIDC_PS_FONT_HEAD, //ƒwƒbƒ_[(ƒtƒHƒ“ƒg) // 2013.05.16 Uchi - IDC_BUTTON_FONT_HEAD, HIDC_PS_FONT_HEAD, //ƒwƒbƒ_[(ƒtƒHƒ“ƒg) // 2013.05.16 Uchi - IDC_CHECK_USE_FONT_FOOT, HIDC_PS_FONT_FOOT, //ƒtƒbƒ^[(ƒtƒHƒ“ƒg) // 2013/5/16 Uchi - IDC_BUTTON_FONT_FOOT, HIDC_PS_FONT_FOOT, //ƒtƒbƒ^[(ƒtƒHƒ“ƒg) // 2013/5/16 Uchi + IDC_CHECK_WORDWRAP, HIDC_PS_CHECK_WORDWRAP, //ワードラップ + IDC_CHECK_LINENUMBER, HIDC_PS_CHECK_LINENUMBER, //è¡Œç•ªå· + IDC_CHECK_PS_KINSOKUHEAD, HIDC_PS_CHECK_KINSOKUHEAD, //行頭ç¦å‰‡ //@@@ 2002.04.09 MIK + IDC_CHECK_PS_KINSOKUTAIL, HIDC_PS_CHECK_KINSOKUTAIL, //行末ç¦å‰‡ //@@@ 2002.04.09 MIK + IDC_CHECK_PS_KINSOKURET, HIDC_PS_CHECK_KINSOKURET, //改行文字をã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.14 MIK + IDC_CHECK_PS_KINSOKUKUTO, HIDC_PS_CHECK_KINSOKUKUTO, //å¥èª­ç‚¹ã‚’ã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.17 MIK + IDC_CHECK_COLORPRINT, HIDC_PS_CHECK_COLORPRINT, //カラーå°åˆ· // 2013/4/26 Uchi + IDC_EDIT_HEAD1, HIDC_PS_EDIT_HEAD1, //ヘッダー(左寄ã›) // 2006.10.11 ryoji + IDC_EDIT_HEAD2, HIDC_PS_EDIT_HEAD2, //ヘッダー(中央寄ã›) // 2006.10.11 ryoji + IDC_EDIT_HEAD3, HIDC_PS_EDIT_HEAD3, //ヘッダー(å³å¯„ã›) // 2006.10.11 ryoji + IDC_EDIT_FOOT1, HIDC_PS_EDIT_FOOT1, //フッター(左寄ã›) // 2006.10.11 ryoji + IDC_EDIT_FOOT2, HIDC_PS_EDIT_FOOT2, //フッター(中央寄ã›) // 2006.10.11 ryoji + IDC_EDIT_FOOT3, HIDC_PS_EDIT_FOOT3, //フッター(å³å¯„ã›) // 2006.10.11 ryoji + IDC_CHECK_USE_FONT_HEAD, HIDC_PS_FONT_HEAD, //ヘッダー(フォント) // 2013.05.16 Uchi + IDC_BUTTON_FONT_HEAD, HIDC_PS_FONT_HEAD, //ヘッダー(フォント) // 2013.05.16 Uchi + IDC_CHECK_USE_FONT_FOOT, HIDC_PS_FONT_FOOT, //フッター(フォント) // 2013/5/16 Uchi + IDC_BUTTON_FONT_FOOT, HIDC_PS_FONT_FOOT, //フッター(フォント) // 2013/5/16 Uchi IDOK, HIDOK_PS, //OK - IDCANCEL, HIDCANCEL_PS, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_PS_BUTTON_HELP, //ƒwƒ‹ƒv + IDCANCEL, HIDCANCEL_PS, //キャンセル + IDC_BUTTON_HELP, HIDC_PS_BUTTON_HELP, //ヘルプ 0, 0 }; //@@@ 2002.01.07 add end MIK @@ -112,7 +112,7 @@ int CALLBACK SetData_EnumFontFamProc( return 1; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgPrintSetting::DoModal( HINSTANCE hInstance, HWND hwndParent, @@ -143,24 +143,24 @@ BOOL CDlgPrintSetting::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam { _SetHwnd( hwndDlg ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_SETTINGNAME ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_HAN ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_ZEN ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_PAPER ), TRUE ); - // ƒ^ƒCƒ}[‚Å‚ÌXV‚ð‚â‚ß‚ÄA”\“®“I‚ÉXV—v‹‚·‚é 2013.5.5 aroka - // CDialog::OnInitDialog‚̉œ‚ÅOnChangeSettingType‚ªŒÄ‚΂ê‚é‚Ì‚Å‚±‚±‚Å‚ÍXV—v‹‚µ‚È‚¢ + // タイマーã§ã®æ›´æ–°ã‚’ã‚„ã‚ã¦ã€èƒ½å‹•çš„ã«æ›´æ–°è¦æ±‚ã™ã‚‹ 2013.5.5 aroka + // CDialog::OnInitDialogã®å¥¥ã§OnChangeSettingTypeãŒå‘¼ã°ã‚Œã‚‹ã®ã§ã“ã“ã§ã¯æ›´æ–°è¦æ±‚ã—ãªã„ // ::SetTimer( GetHwnd(), IDT_PRINTSETTING, 500, NULL ); //UpdatePrintableLineAndColumn(); - // ƒ_ƒCƒAƒƒO‚̃tƒHƒ“ƒg‚̎擾 - m_hFontDlg = (HFONT)::SendMessage( GetHwnd(), WM_GETFONT, 0, 0 ); // ƒ_ƒCƒAƒƒO‚̃tƒHƒ“ƒg + // ダイアログã®ãƒ•ã‚©ãƒ³ãƒˆã®å–å¾— + m_hFontDlg = (HFONT)::SendMessage( GetHwnd(), WM_GETFONT, 0, 0 ); // ダイアログã®ãƒ•ã‚©ãƒ³ãƒˆ LOGFONT lf; ::GetObject(m_hFontDlg, sizeof(LOGFONT), &lf); - m_nFontHeight = lf.lfHeight; // ƒtƒHƒ“ƒgƒTƒCƒY + m_nFontHeight = lf.lfHeight; // フォントサイズ - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnInitDialog( GetHwnd(), wParam, lParam ); } @@ -168,7 +168,7 @@ BOOL CDlgPrintSetting::OnDestroy( void ) { ::KillTimer( GetHwnd(), IDT_PRINTSETTING ); - // ƒtƒHƒ“ƒg‚Ì”jŠü + // フォントã®ç ´æ£„ HFONT hFontOld; hFontOld = (HFONT)::SendMessage(::GetDlgItem( GetHwnd(), IDC_STATIC_FONT_HEAD ), WM_GETFONT, 0, 0 ); if (m_hFontDlg != hFontOld) { @@ -179,7 +179,7 @@ BOOL CDlgPrintSetting::OnDestroy( void ) ::DeleteObject( hFontOld ); } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnDestroy(); } @@ -206,7 +206,7 @@ BOOL CDlgPrintSetting::OnNotify( WPARAM wParam, LPARAM lParam ) case IDC_SPIN_MARGINBY: case IDC_SPIN_MARGINLX: case IDC_SPIN_MARGINRX: - /* ƒXƒsƒ“ƒRƒ“ƒgƒ[ƒ‹‚̈— */ + /* スピンコントロールã®å‡¦ç† */ OnSpin( idCtrl, bSpinDown ); UpdatePrintableLineAndColumn(); break; @@ -219,14 +219,14 @@ BOOL CDlgPrintSetting::OnCbnSelChange( HWND hwndCtl, int wID ) // if( ::GetDlgItem( GetHwnd(), IDC_COMBO_SETTINGNAME ) == hwndCtl ){ switch( wID ){ case IDC_COMBO_SETTINGNAME: - /* Ý’è‚̃^ƒCƒv‚ª•Ï‚í‚Á‚½ */ + /* 設定ã®ã‚¿ã‚¤ãƒ—ãŒå¤‰ã‚ã£ãŸ */ OnChangeSettingType( TRUE ); return TRUE; case IDC_COMBO_FONT_HAN: case IDC_COMBO_FONT_ZEN: case IDC_COMBO_PAPER: UpdatePrintableLineAndColumn(); - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ } return FALSE; } @@ -239,9 +239,9 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) HWND hwndComboSettingName; switch( wID ){ case IDC_BUTTON_HELP: - /* uˆóüƒy[ƒWÝ’èv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_PRINT_PAGESETUP) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「å°åˆ·ãƒšãƒ¼ã‚¸è¨­å®šã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_PRINT_PAGESETUP) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; case IDC_BUTTON_EDITSETTINGNAME: _tcscpy( szWork, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintSettingName ); @@ -262,7 +262,7 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) int size = _countof(m_PrintSettingArr[0].m_szPrintSettingName) - 1; _tcsncpy( m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintSettingName, szWork, size); m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintSettingName[size] = _T('\0'); - /* ˆóüÝ’è–¼ˆê—— */ + /* å°åˆ·è¨­å®šå一覧 */ hwndComboSettingName = ::GetDlgItem( GetHwnd(), IDC_COMBO_SETTINGNAME ); Combo_ResetContent( hwndComboSettingName ); int nSelectIdx; @@ -288,9 +288,9 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) INT nPointSize; if (lf.lfFaceName[0] == _T('\0')) { - // ”¼ŠpƒtƒHƒ“ƒg‚ðÝ’è + // åŠè§’フォントを設定 auto_strcpy( lf.lfFaceName, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintFontFaceHan ); - // 1/10mm¨‰æ–ʃhƒbƒg” + // 1/10mm→画é¢ãƒ‰ãƒƒãƒˆæ•° lf.lfHeight = -( m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintFontHeight * ::GetDeviceCaps ( ::GetDC( m_hwndParent ), LOGPIXELSY ) / 254 ); } @@ -311,9 +311,9 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) INT nPointSize; if (lf.lfFaceName[0] == _T('\0')) { - // ”¼ŠpƒtƒHƒ“ƒg‚ðÝ’è + // åŠè§’フォントを設定 auto_strcpy( lf.lfFaceName, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintFontFaceHan ); - // 1/10mm¨‰æ–ʃhƒbƒg” + // 1/10mm→画é¢ãƒ‰ãƒƒãƒˆæ•° lf.lfHeight = -( m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintFontHeight * ::GetDeviceCaps ( ::GetDC( m_hwndParent ), LOGPIXELSY ) / 254 ); } @@ -350,7 +350,7 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) return TRUE; case IDOK: if( CalcPrintableLineAndColumn() ){ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), GetData() ); } return TRUE; @@ -360,12 +360,12 @@ BOOL CDlgPrintSetting::OnBnClicked( int wID ) case IDC_RADIO_PORTRAIT: case IDC_RADIO_LANDSCAPE: UpdatePrintableLineAndColumn(); - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ case IDC_CHECK_LINENUMBER: UpdatePrintableLineAndColumn(); - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } @@ -375,15 +375,15 @@ BOOL CDlgPrintSetting::OnStnClicked( int wID ) switch( wID ){ case IDC_STATIC_ENABLECOLUMNS: case IDC_STATIC_ENABLELINES: - // Œ»óƒNƒŠƒbƒN‚͎󂯕t‚¯‚Ä‚¢‚È‚¢‚ªAƒƒbƒZ[ƒWˆ—‚µ‚½‚¢‚Ì‚Å‚±‚±‚É”z’u 2013.5.5 aroka - // ƒƒbƒZ[ƒW‚ª˜A‘±‚µ‚Ä‘—‚ç‚ꂽ‚Æ‚«‚͈ê‰ñ‚¾‚¯‘Ήž‚·‚é 2013.5.5 aroka + // ç¾çŠ¶ã‚¯ãƒªãƒƒã‚¯ã¯å—ã‘付ã‘ã¦ã„ãªã„ãŒã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å‡¦ç†ã—ãŸã„ã®ã§ã“ã“ã«é…ç½® 2013.5.5 aroka + // メッセージãŒé€£ç¶šã—ã¦é€ã‚‰ã‚ŒãŸã¨ãã¯ä¸€å›žã ã‘対応ã™ã‚‹ 2013.5.5 aroka if( m_bPrintableLinesAndColumnInvalid ){ m_bPrintableLinesAndColumnInvalid = false; CalcPrintableLineAndColumn(); } return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnStnClicked( wID ); } @@ -391,11 +391,11 @@ BOOL CDlgPrintSetting::OnStnClicked( int wID ) BOOL CDlgPrintSetting::OnEnChange( HWND hwndCtl, int wID ) { switch( wID ){ - case IDC_EDIT_FONTHEIGHT: // ƒtƒHƒ“ƒg•‚ÌŬ’l‚ª”ñ‚O‚Ì‚½‚ß'12'‚Æ“ü—Í‚·‚é‚Æ'1'‚Ì‚Æ‚±‚ë‚ÅR‚ç‚ê‚Ä‚µ‚Ü‚¤ 2013.5.5 aroka - if( ::GetDlgItemInt( GetHwnd(), IDC_EDIT_FONTHEIGHT, NULL, FALSE ) >=10 ){ // “ñŒ…ˆÈã‚Ìꇂ͗̈æƒ`ƒFƒbƒN 2013.5.20 aroka + case IDC_EDIT_FONTHEIGHT: // フォント幅ã®æœ€å°å€¤ãŒéžï¼ã®ãŸã‚'12'ã¨å…¥åŠ›ã™ã‚‹ã¨'1'ã®ã¨ã“ã‚ã§è¹´ã‚‰ã‚Œã¦ã—ã¾ã† 2013.5.5 aroka + if( ::GetDlgItemInt( GetHwnd(), IDC_EDIT_FONTHEIGHT, NULL, FALSE ) >=10 ){ // 二æ¡ä»¥ä¸Šã®å ´åˆã¯é ˜åŸŸãƒã‚§ãƒƒã‚¯ 2013.5.20 aroka UpdatePrintableLineAndColumn(); } - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ case IDC_EDIT_LINESPACE: case IDC_EDIT_DANSUU: case IDC_EDIT_DANSPACE: @@ -404,9 +404,9 @@ BOOL CDlgPrintSetting::OnEnChange( HWND hwndCtl, int wID ) case IDC_EDIT_MARGINLX: case IDC_EDIT_MARGINRX: UpdatePrintableLineAndColumn(); - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnEnChange( hwndCtl, wID ); } @@ -415,28 +415,28 @@ BOOL CDlgPrintSetting::OnEnKillFocus( HWND hwndCtl, int wID ) { switch( wID ){ case IDC_EDIT_FONTHEIGHT: - //case IDC_EDIT_LINESPACE: // EN_CHANGE ‚ÅŒvŽZ‚µ‚Ä‚¢‚é‚Ì‚Åç’·‚©‚ÈA‚ÆŽv‚¢ƒRƒƒ“ƒgƒAƒEƒg 2013.5.5 aroka + //case IDC_EDIT_LINESPACE: // EN_CHANGE ã§è¨ˆç®—ã—ã¦ã„ã‚‹ã®ã§å†—é•·ã‹ãªã€ã¨æ€ã„コメントアウト 2013.5.5 aroka //case IDC_EDIT_DANSUU: //case IDC_EDIT_DANSPACE: //case IDC_EDIT_MARGINTY: //case IDC_EDIT_MARGINBY: //case IDC_EDIT_MARGINLX: //case IDC_EDIT_MARGINRX: - case IDC_EDIT_HEAD1: // ƒeƒLƒXƒg•ÒW‚Ì‚½‚тɃ`ƒFƒbƒN‚·‚é‚Æ’x‚¢‚̂ŃtƒH[ƒJƒXˆÚ“®Žž‚Ì‚Ý 2013.5.12 aroka + case IDC_EDIT_HEAD1: // テキスト編集ã®ãŸã³ã«ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã¨é…ã„ã®ã§ãƒ•ã‚©ãƒ¼ã‚«ã‚¹ç§»å‹•æ™‚ã®ã¿ 2013.5.12 aroka case IDC_EDIT_HEAD2: case IDC_EDIT_HEAD3: case IDC_EDIT_FOOT1: case IDC_EDIT_FOOT2: case IDC_EDIT_FOOT3: UpdatePrintableLineAndColumn(); - break; // ‚±‚±‚Å‚Ís‚ÆŒ…‚ÌXV—v‹‚Ì‚ÝBŒã‚̈—‚ÍCDialog‚É”C‚¹‚éB + break; // ã“ã“ã§ã¯è¡Œã¨æ¡ã®æ›´æ–°è¦æ±‚ã®ã¿ã€‚後ã®å‡¦ç†ã¯CDialogã«ä»»ã›ã‚‹ã€‚ } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnEnKillFocus( hwndCtl, wID ); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgPrintSetting::SetData( void ) { HDC hdc; @@ -448,7 +448,7 @@ void CDlgPrintSetting::SetData( void ) int nSelectIdx; - /* ƒtƒHƒ“ƒgˆê—— */ + /* フォント一覧 */ hdc = ::GetDC( m_hwndParent ); hwndComboFont = ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_HAN ); Combo_ResetContent( hwndComboFont ); @@ -462,17 +462,17 @@ void CDlgPrintSetting::SetData( void ) ); ::ReleaseDC( m_hwndParent, hdc ); - /* —pŽ†ƒTƒCƒYˆê—— */ + /* 用紙サイズ一覧 */ hwndComboPaper = ::GetDlgItem( GetHwnd(), IDC_COMBO_PAPER ); Combo_ResetContent( hwndComboPaper ); - // 2006.08.14 Moca —pŽ†–¼ˆê——‚Ìd•¡íœ + // 2006.08.14 Moca 用紙å一覧ã®é‡è¤‡å‰Šé™¤ for( i = 0; i < CPrint::m_nPaperInfoArrNum; ++i ){ nItemIdx = Combo_AddString( hwndComboPaper, CPrint::m_paperInfoArr[i].m_pszName ); Combo_SetItemData( hwndComboPaper, nItemIdx, CPrint::m_paperInfoArr[i].m_nId ); } - /* ˆóüÝ’è–¼ˆê—— */ + /* å°åˆ·è¨­å®šå一覧 */ hwndComboSettingName = ::GetDlgItem( GetHwnd(), IDC_COMBO_SETTINGNAME ); Combo_ResetContent( hwndComboSettingName ); nSelectIdx = 0; @@ -485,7 +485,7 @@ void CDlgPrintSetting::SetData( void ) } Combo_SetCurSel( hwndComboSettingName, nSelectIdx ); - /* Ý’è‚̃^ƒCƒv‚ª•Ï‚í‚Á‚½ */ + /* 設定ã®ã‚¿ã‚¤ãƒ—ãŒå¤‰ã‚ã£ãŸ */ OnChangeSettingType( FALSE ); return; @@ -494,21 +494,21 @@ void CDlgPrintSetting::SetData( void ) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgPrintSetting::GetData( void ) { HWND hwndCtrl; int nIdx1; int nWork; - /* ƒtƒHƒ“ƒgˆê—— */ + /* フォント一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_HAN ); nIdx1 = Combo_GetCurSel( hwndCtrl ); Combo_GetLBText( hwndCtrl, nIdx1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintFontFaceHan ); - /* ƒtƒHƒ“ƒgˆê—— */ + /* フォント一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_ZEN ); nIdx1 = Combo_GetCurSel( hwndCtrl ); Combo_GetLBText( hwndCtrl, nIdx1, @@ -520,7 +520,7 @@ int CDlgPrintSetting::GetData( void ) m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintDansuu = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_DANSUU, NULL, FALSE ); m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintDanSpace = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_DANSPACE, NULL, FALSE ) * 10; - /* “ü—Í’l(”’l)‚̃Gƒ‰[ƒ`ƒFƒbƒN‚ð‚µ‚Ä³‚µ‚¢’l‚ð•Ô‚· */ + /* 入力値(数値)ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦æ­£ã—ã„値を返㙠*/ nWork = DataCheckAndCorrect( IDC_EDIT_FONTHEIGHT, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintFontHeight ); if( nWork != m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintFontHeight ){ m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintFontHeight = nWork; @@ -544,14 +544,14 @@ int CDlgPrintSetting::GetData( void ) ::SetDlgItemInt( GetHwnd(), IDC_EDIT_DANSPACE, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintDanSpace / 10, FALSE ); } - /* —pŽ†ƒTƒCƒYˆê—— */ + /* 用紙サイズ一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_PAPER ); nIdx1 = Combo_GetCurSel( hwndCtrl ); m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintPaperSize = (short)Combo_GetItemData( hwndCtrl, nIdx1 ); - // —pŽ†‚ÌŒü‚« - // 2006.08.14 Moca —pŽ†•ûŒüƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ð”pŽ~‚µAƒ{ƒ^ƒ“‚ð—LŒø‰» + // 用紙ã®å‘ã + // 2006.08.14 Moca 用紙方å‘コンボボックスを廃止ã—ã€ãƒœã‚¿ãƒ³ã‚’有効化 if( IsDlgButtonCheckedBool( GetHwnd(), IDC_RADIO_PORTRAIT ) ){ m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintPaperOrientation = DMORIENT_PORTRAIT; }else{ @@ -563,7 +563,7 @@ int CDlgPrintSetting::GetData( void ) m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginLX = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINLX, NULL, FALSE ) * 10; m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginRX = ::GetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINRX, NULL, FALSE ) * 10; - /* “ü—Í’l(”’l)‚̃Gƒ‰[ƒ`ƒFƒbƒN‚ð‚µ‚Ä³‚µ‚¢’l‚ð•Ô‚· */ + /* 入力値(数値)ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦æ­£ã—ã„値を返㙠*/ nWork = DataCheckAndCorrect( IDC_EDIT_MARGINTY, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginTY / 10 ); if( nWork != m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginTY / 10 ){ m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginTY = nWork * 10; @@ -585,40 +585,40 @@ int CDlgPrintSetting::GetData( void ) ::SetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINRX, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginRX / 10, FALSE ); } - // s”Ô†‚ðˆóü + // 行番å·ã‚’å°åˆ· m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintLineNumber = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_LINENUMBER ); - // ‰p•¶ƒ[ƒhƒ‰ƒbƒv + // 英文ワードラップ m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintWordWrap = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_WORDWRAP ); - //s“ª‹Ö‘¥ //@@@ 2002.04.09 MIK + //行頭ç¦å‰‡ //@@@ 2002.04.09 MIK m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuHead = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_PS_KINSOKUHEAD ); - //s––‹Ö‘¥ //@@@ 2002.04.09 MIK + //行末ç¦å‰‡ //@@@ 2002.04.09 MIK m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuTail = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_PS_KINSOKUTAIL ); - //‰üs•¶Žš‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.13 MIK + //改行文字をã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.13 MIK m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuRet = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_PS_KINSOKURET ); - //‹å“Ç“_‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.17 MIK + //å¥èª­ç‚¹ã‚’ã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.17 MIK m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuKuto = IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_PS_KINSOKUKUTO ); - // ƒJƒ‰[ˆóü + // カラーå°åˆ· m_PrintSettingArr[m_nCurrentPrintSetting].m_bColorPrint = ( BST_CHECKED == ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_COLORPRINT ) ); //@@@ 2002.2.4 YAZAKI - /* ƒwƒbƒ_[ */ - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[0], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[1], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[2], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB + /* ヘッダー */ + ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[0], HEADER_MAX ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[1], HEADER_MAX ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::DlgItem_GetText( GetHwnd(), IDC_EDIT_HEAD3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[2], HEADER_MAX ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 - /* ƒtƒbƒ^[ */ - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[0], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[1], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[2], HEADER_MAX ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB + /* フッター */ + ::DlgItem_GetText( GetHwnd(), IDC_EDIT_FOOT1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[0], HEADER_MAX ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::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文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 - // ƒwƒbƒ_ƒtƒHƒ“ƒg + // ヘッダフォント if (!IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_USE_FONT_HEAD )) { memset( &m_PrintSettingArr[m_nCurrentPrintSetting].m_lfHeader, 0, sizeof(LOGFONT) ); } - // ƒtƒbƒ^ƒtƒHƒ“ƒg + // フッタフォント if (!IsDlgButtonCheckedBool( GetHwnd(), IDC_CHECK_USE_FONT_FOOT )) { memset( &m_PrintSettingArr[m_nCurrentPrintSetting].m_lfFooter, 0, sizeof(LOGFONT) ); } @@ -627,7 +627,7 @@ int CDlgPrintSetting::GetData( void ) } -/* Ý’è‚̃^ƒCƒv‚ª•Ï‚í‚Á‚½ */ +/* 設定ã®ã‚¿ã‚¤ãƒ—ãŒå¤‰ã‚ã£ãŸ */ void CDlgPrintSetting::OnChangeSettingType( BOOL bGetData ) { HWND hwndComboSettingName; @@ -648,12 +648,12 @@ void CDlgPrintSetting::OnChangeSettingType( BOOL bGetData ) } m_nCurrentPrintSetting = Combo_GetItemData( hwndComboSettingName, nIdx1 ); - /* ƒtƒHƒ“ƒgˆê—— */ + /* フォント一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_HAN ); nIdx1 = Combo_FindStringExact( hwndCtrl, 0, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintFontFaceHan ); Combo_SetCurSel( hwndCtrl, nIdx1 ); - /* ƒtƒHƒ“ƒgˆê—— */ + /* フォント一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_FONT_ZEN ); nIdx1 = Combo_FindStringExact( hwndCtrl, 0, m_PrintSettingArr[m_nCurrentPrintSetting].m_szPrintFontFaceZen ); Combo_SetCurSel( hwndCtrl, nIdx1 ); @@ -663,7 +663,7 @@ void CDlgPrintSetting::OnChangeSettingType( BOOL bGetData ) ::SetDlgItemInt( GetHwnd(), IDC_EDIT_DANSUU, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintDansuu, FALSE ); ::SetDlgItemInt( GetHwnd(), IDC_EDIT_DANSPACE, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintDanSpace / 10, FALSE ); - /* —pŽ†ƒTƒCƒYˆê—— */ + /* 用紙サイズ一覧 */ hwndCtrl = ::GetDlgItem( GetHwnd(), IDC_COMBO_PAPER ); nItemNum = Combo_GetCount( hwndCtrl ); for( i = 0; i < nItemNum; ++i ){ @@ -674,52 +674,52 @@ void CDlgPrintSetting::OnChangeSettingType( BOOL bGetData ) } } - // —pŽ†‚ÌŒü‚« - // 2006.08.14 Moca —pŽ†•ûŒüƒRƒ“ƒ{ƒ{ƒbƒNƒX‚ð”pŽ~‚µAƒ{ƒ^ƒ“‚ð—LŒø‰» + // 用紙ã®å‘ã + // 2006.08.14 Moca 用紙方å‘コンボボックスを廃止ã—ã€ãƒœã‚¿ãƒ³ã‚’有効化 bool bIsPortrait = ( m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintPaperOrientation == DMORIENT_PORTRAIT ); CheckDlgButtonBool( GetHwnd(), IDC_RADIO_PORTRAIT, bIsPortrait ); CheckDlgButtonBool( GetHwnd(), IDC_RADIO_LANDSCAPE, !bIsPortrait ); - // —]”’ + // 余白 ::SetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINTY, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginTY / 10, FALSE ); ::SetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINBY, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginBY / 10, FALSE ); ::SetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINLX, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginLX / 10, FALSE ); ::SetDlgItemInt( GetHwnd(), IDC_EDIT_MARGINRX, m_PrintSettingArr[m_nCurrentPrintSetting].m_nPrintMarginRX / 10, FALSE ); - // s”Ô†‚ðˆóü + // 行番å·ã‚’å°åˆ· CheckDlgButtonBool( GetHwnd(), IDC_CHECK_LINENUMBER, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintLineNumber ); - // ‰p•¶ƒ[ƒhƒ‰ƒbƒv + // 英文ワードラップ CheckDlgButtonBool( GetHwnd(), IDC_CHECK_WORDWRAP, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintWordWrap ); - // s“ª‹Ö‘¥ //@@@ 2002.04.09 MIK + // 行頭ç¦å‰‡ //@@@ 2002.04.09 MIK CheckDlgButtonBool( GetHwnd(), IDC_CHECK_PS_KINSOKUHEAD, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuHead ); - // s––‹Ö‘¥ //@@@ 2002.04.09 MIK + // 行末ç¦å‰‡ //@@@ 2002.04.09 MIK CheckDlgButtonBool( GetHwnd(), IDC_CHECK_PS_KINSOKUTAIL, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuTail ); - // ‰üs•¶Žš‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.13 MIK + // 改行文字をã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.13 MIK CheckDlgButtonBool( GetHwnd(), IDC_CHECK_PS_KINSOKURET, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuRet ); - // ‹å“Ç“_‚ð‚Ԃ牺‚°‚é //@@@ 2002.04.17 MIK + // å¥èª­ç‚¹ã‚’ã¶ã‚‰ä¸‹ã’ã‚‹ //@@@ 2002.04.17 MIK CheckDlgButtonBool( GetHwnd(), IDC_CHECK_PS_KINSOKUKUTO, m_PrintSettingArr[m_nCurrentPrintSetting].m_bPrintKinsokuKuto ); - // ƒJƒ‰[ˆóü + // カラーå°åˆ· ::CheckDlgButton( GetHwnd(), IDC_CHECK_COLORPRINT, m_PrintSettingArr[m_nCurrentPrintSetting].m_bColorPrint ? BST_CHECKED : BST_UNCHECKED); - /* ƒwƒbƒ_[ */ - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_LEFT] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_CENTER] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_RIGHT] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB + /* ヘッダー */ + ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_LEFT] ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_CENTER] ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::DlgItem_SetText( GetHwnd(), IDC_EDIT_HEAD3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szHeaderForm[POS_RIGHT] ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 - /* ƒtƒbƒ^[ */ - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_LEFT] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT2, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_CENTER] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB - ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT3, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_RIGHT] ); // 100•¶Žš‚ŧŒÀ‚µ‚È‚¢‚ÆBBB + /* フッター */ + ::DlgItem_SetText( GetHwnd(), IDC_EDIT_FOOT1, m_PrintSettingArr[m_nCurrentPrintSetting].m_szFooterForm[POS_LEFT] ); // 100文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 + ::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文字ã§åˆ¶é™ã—ãªã„ã¨ã€‚。。 - // ƒwƒbƒ_ƒtƒHƒ“ƒg + // ヘッダフォント SetFontName( IDC_STATIC_FONT_HEAD, IDC_CHECK_USE_FONT_HEAD, m_PrintSettingArr[m_nCurrentPrintSetting].m_lfHeader, m_PrintSettingArr[m_nCurrentPrintSetting].m_nHeaderPointSize ); - // ƒtƒbƒ^ƒtƒHƒ“ƒg + // フッタフォント SetFontName( IDC_STATIC_FONT_FOOT, IDC_CHECK_USE_FONT_FOOT, m_PrintSettingArr[m_nCurrentPrintSetting].m_lfFooter, m_PrintSettingArr[m_nCurrentPrintSetting].m_nFooterPointSize ); @@ -744,7 +744,7 @@ const struct { { IDC_EDIT_MARGINRX, 0, 50 }, //!< mm }; -/* ƒXƒsƒ“ƒRƒ“ƒgƒ[ƒ‹‚̈— */ +/* スピンコントロールã®å‡¦ç† */ void CDlgPrintSetting::OnSpin( int nCtrlId, BOOL bDown ) { int nData = 0; @@ -769,14 +769,14 @@ void CDlgPrintSetting::OnSpin( int nCtrlId, BOOL bDown ) }else{ nData += nDiff; } - /* “ü—Í’l(”’l)‚̃Gƒ‰[ƒ`ƒFƒbƒN‚ð‚µ‚Ä³‚µ‚¢’l‚ð•Ô‚· */ + /* 入力値(数値)ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦æ­£ã—ã„値を返㙠*/ nData = DataCheckAndCorrect( nCtrlIdEDIT, nData ); ::SetDlgItemInt( GetHwnd(), nCtrlIdEDIT, nData, FALSE ); } } -/* “ü—Í’l(”’l)‚̃Gƒ‰[ƒ`ƒFƒbƒN‚ð‚µ‚Ä³‚µ‚¢’l‚ð•Ô‚· */ +/* 入力値(数値)ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦æ­£ã—ã„値を返㙠*/ int CDlgPrintSetting::DataCheckAndCorrect( int nCtrlId, int nData ) { int nIdx = -1; @@ -803,53 +803,53 @@ int CDlgPrintSetting::DataCheckAndCorrect( int nCtrlId, int nData ) /*! - ˆóŽš‰Â”\s”‚ÆŒ…”‚ðŒvŽZ - @date 2013.05.05 aroka OnTimer‚©‚çˆÚ“® - @retval ˆóŽš‰Â”\—̈悪‚ ‚ê‚Î TRUE // 2013.05.20 aroka + å°å­—å¯èƒ½è¡Œæ•°ã¨æ¡æ•°ã‚’計算 + @date 2013.05.05 aroka OnTimerã‹ã‚‰ç§»å‹• + @retval å°å­—å¯èƒ½é ˜åŸŸãŒã‚れ㰠TRUE // 2013.05.20 aroka */ BOOL CDlgPrintSetting::CalcPrintableLineAndColumn() { - int nEnableColumns; /* s‚ ‚½‚è‚Ì•¶Žš” */ - int nEnableLines; /* c•ûŒü‚Ìs” */ - MYDEVMODE dmDummy; // 2003.05.18 ‚©‚ë‚Æ Œ^•ÏX - short nPaperAllWidth; /* —pŽ†• */ - short nPaperAllHeight; /* —pŽ†‚‚³ */ + int nEnableColumns; /* è¡Œã‚ãŸã‚Šã®æ–‡å­—æ•° */ + int nEnableLines; /* 縦方å‘ã®è¡Œæ•° */ + MYDEVMODE dmDummy; // 2003.05.18 ã‹ã‚㨠型変更 + short nPaperAllWidth; /* 用紙幅 */ + short nPaperAllHeight; /* 用紙高㕠*/ PRINTSETTING* pPS; - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ GetData(); pPS = &m_PrintSettingArr[m_nCurrentPrintSetting]; dmDummy.dmFields = DM_PAPERSIZE | DMORIENT_LANDSCAPE; dmDummy.dmPaperSize = pPS->m_nPrintPaperSize; dmDummy.dmOrientation = pPS->m_nPrintPaperOrientation; - /* —pŽ†‚Ì•A‚‚³ */ + /* 用紙ã®å¹…ã€é«˜ã• */ if( !CPrint::GetPaperSize( &nPaperAllWidth, &nPaperAllHeight, &dmDummy ) ){ - // 2001.12.21 hor GetPaperSizeŽ¸”sŽž‚Í‚»‚Ì‚Ü‚ÜI—¹ - // nPaperAllWidth = 210 * 10; /* —pŽ†• */ - // nPaperAllHeight = 297 * 10; /* —pŽ†‚‚³ */ + // 2001.12.21 hor GetPaperSize失敗時ã¯ãã®ã¾ã¾çµ‚了 + // nPaperAllWidth = 210 * 10; /* 用紙幅 */ + // nPaperAllHeight = 297 * 10; /* 用紙高㕠*/ return FALSE; } - /* s‚ ‚½‚è‚Ì•¶Žš”(s”Ô†ž‚Ý) */ - nEnableColumns = CPrint::CalculatePrintableColumns( pPS, nPaperAllWidth, pPS->m_bPrintLineNumber?m_nLineNumberColumns:0 ); /* ˆóŽš‰Â”\Œ…”/ƒy[ƒW */ - /* c•ûŒü‚Ìs” */ - nEnableLines = CPrint::CalculatePrintableLines( pPS, nPaperAllHeight ); /* ˆóŽš‰Â”\s”/ƒy[ƒW */ + /* è¡Œã‚ãŸã‚Šã®æ–‡å­—æ•°(行番å·è¾¼ã¿) */ + nEnableColumns = CPrint::CalculatePrintableColumns( pPS, nPaperAllWidth, pPS->m_bPrintLineNumber?m_nLineNumberColumns:0 ); /* å°å­—å¯èƒ½æ¡æ•°/ページ */ + /* 縦方å‘ã®è¡Œæ•° */ + nEnableLines = CPrint::CalculatePrintableLines( pPS, nPaperAllHeight ); /* å°å­—å¯èƒ½è¡Œæ•°/ページ */ ::SetDlgItemInt( GetHwnd(), IDC_STATIC_ENABLECOLUMNS, nEnableColumns, FALSE ); ::SetDlgItemInt( GetHwnd(), IDC_STATIC_ENABLELINES, nEnableLines, FALSE ); - // ƒtƒHƒ“ƒg‚̃|ƒCƒ“ƒg” 2013/5/9 Uchi + // フォントã®ãƒã‚¤ãƒ³ãƒˆæ•° 2013/5/9 Uchi // 1pt = 1/72in = 25.4/72mm int nFontPoints = pPS->m_nPrintFontHeight * 720 / 254; TCHAR szFontPoints[20]; auto_sprintf_s( szFontPoints, _countof(szFontPoints), _T("%d.%dpt"), nFontPoints/10, nFontPoints%10 ); ::DlgItem_SetText( GetHwnd(), IDC_STATIC_FONTSIZE, szFontPoints ); - // ˆóŽš‰Â”\—̈悪‚È‚¢ê‡‚Í OK ‚ð‰Ÿ‚¹‚È‚­‚·‚é 2013.5.10 aroka + // å°å­—å¯èƒ½é ˜åŸŸãŒãªã„å ´åˆã¯ OK を押ã›ãªãã™ã‚‹ 2013.5.10 aroka if( nEnableColumns == 0 || nEnableLines == 0 ){ ::EnableWindow( GetDlgItem( GetHwnd(), IDOK ), FALSE ); return FALSE; @@ -860,8 +860,8 @@ BOOL CDlgPrintSetting::CalcPrintableLineAndColumn() } -// s”‚ÆŒ…”‚ÌXV‚ð—v‹iƒƒbƒZ[ƒWƒLƒ…[‚Ƀ|ƒXƒg‚·‚éj -// ƒ_ƒCƒAƒƒO‰Šú‰»‚Ì“r’†‚Å EN_CHANGE ‚É”½‰ž‚·‚é‚ÆŒvŽZ‚ª‚¨‚©‚µ‚­‚Ȃ邽‚ßAŠÖ”ŒÄ‚Ño‚µ‚Å‚Í‚È‚­PostMessage‚ň— 2013.5.5 aroka +// 行数ã¨æ¡æ•°ã®æ›´æ–°ã‚’è¦æ±‚（メッセージキューã«ãƒã‚¹ãƒˆã™ã‚‹ï¼‰ +// ダイアログåˆæœŸåŒ–ã®é€”中㧠EN_CHANGE ã«åå¿œã™ã‚‹ã¨è¨ˆç®—ãŒãŠã‹ã—ããªã‚‹ãŸã‚ã€é–¢æ•°å‘¼ã³å‡ºã—ã§ã¯ãªãPostMessageã§å‡¦ç† 2013.5.5 aroka void CDlgPrintSetting::UpdatePrintableLineAndColumn() { m_bPrintableLinesAndColumnInvalid = true; @@ -877,7 +877,7 @@ LPVOID CDlgPrintSetting::GetHelpIdTable(void) //@@@ 2002.01.18 add end -// ƒtƒHƒ“ƒg–¼/Žg—pƒ{ƒ^ƒ“‚ÌÝ’è +// フォントå/使用ボタンã®è¨­å®š void CDlgPrintSetting::SetFontName( int idTxt, int idUse, LOGFONT& lf, int nPointSize ) { TCHAR szName[100]; @@ -888,23 +888,23 @@ void CDlgPrintSetting::SetFontName( int idTxt, int idUse, LOGFONT& lf, int nPoin if (bUseFont) { LOGFONT lft; lft = lf; - lft.lfHeight = m_nFontHeight; // ƒtƒHƒ“ƒgƒTƒCƒY‚ðƒ_ƒCƒAƒƒO‚ɇ‚¹‚é + lft.lfHeight = m_nFontHeight; // フォントサイズをダイアログã«åˆã›ã‚‹ HFONT hFontOld = (HFONT)::SendMessage(::GetDlgItem( GetHwnd(), idTxt ), WM_GETFONT, 0, 0 ); - // ˜_—ƒtƒHƒ“ƒg‚ðì¬ + // è«–ç†ãƒ•ã‚©ãƒ³ãƒˆã‚’ä½œæˆ HFONT hFont = ::CreateFontIndirect( &lft ); if (hFont) { - // ƒtƒHƒ“ƒg‚ÌÝ’è + // フォントã®è¨­å®š ::SendMessage( ::GetDlgItem( GetHwnd(), idTxt ), WM_SETFONT, (WPARAM)hFont, MAKELPARAM(FALSE, 0) ); } if (m_hFontDlg != hFontOld) { - // ŒÃ‚¢ƒtƒHƒ“ƒg‚Ì”jŠü + // å¤ã„フォントã®ç ´æ£„ ::DeleteObject( hFontOld ); } - // ƒtƒHƒ“ƒg–¼/ƒTƒCƒY‚Ìì¬ - int nMM = MulDiv( nPointSize, 254, 720 ); // ƒtƒHƒ“ƒgƒTƒCƒYŒvŽZ(pt->1/10mm) + // フォントå/サイズã®ä½œæˆ + int nMM = MulDiv( nPointSize, 254, 720 ); // フォントサイズ計算(pt->1/10mm) auto_sprintf(szName, nPointSize%10 ? _T("%.32s(%.1fpt/%d.%dmm)") : _T("%.32s(%.0fpt/%d.%dmm)"), lf.lfFaceName, double(nPointSize)/10, diff --git a/sakura_core/dlg/CDlgPrintSetting.h b/sakura_core/dlg/CDlgPrintSetting.h index 29788aa575..e8e8c5ea8c 100644 --- a/sakura_core/dlg/CDlgPrintSetting.h +++ b/sakura_core/dlg/CDlgPrintSetting.h @@ -1,5 +1,5 @@ -/*! @file - @brief ˆóüÝ’èƒ_ƒCƒAƒƒO +/*! @file + @brief å°åˆ·è¨­å®šãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Norio Nakatani */ @@ -34,9 +34,9 @@ #include "config/maxdata.h" // MAX_PRINTSETTINGARR #include "print/CPrint.h" //PRINTSETTING -/*! ˆóüÝ’èƒ_ƒCƒAƒƒO +/*! å°åˆ·è¨­å®šãƒ€ã‚¤ã‚¢ãƒ­ã‚° - @date 2002.2.17 YAZAKI CShareData‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ÍACProcess‚ɂЂƂ‚ ‚é‚Ì‚ÝB + @date 2002.2.17 YAZAKI CShareDataã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€CProcessã«ã²ã¨ã¤ã‚ã‚‹ã®ã¿ã€‚ */ class CDlgPrintSetting : public CDialog { @@ -48,22 +48,22 @@ class CDlgPrintSetting : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, int*, PRINTSETTING*, int ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, int*, PRINTSETTING*, int ); /* モーダルダイアログã®è¡¨ç¤º */ private: int m_nCurrentPrintSetting; PRINTSETTING m_PrintSettingArr[MAX_PRINTSETTINGARR]; - int m_nLineNumberColumns; // s”Ô†•\Ž¦‚·‚éꇂ̌…” + int m_nLineNumberColumns; // 行番å·è¡¨ç¤ºã™ã‚‹å ´åˆã®æ¡æ•° bool m_bPrintableLinesAndColumnInvalid; - HFONT m_hFontDlg; // ƒ_ƒCƒAƒƒO‚̃tƒHƒ“ƒgƒnƒ“ƒhƒ‹ - int m_nFontHeight; // ƒ_ƒCƒAƒƒO‚̃tƒHƒ“ƒg‚̃TƒCƒY + HFONT m_hFontDlg; // ダイアログã®ãƒ•ã‚©ãƒ³ãƒˆãƒãƒ³ãƒ‰ãƒ« + int m_nFontHeight; // ダイアログã®ãƒ•ã‚©ãƒ³ãƒˆã®ã‚µã‚¤ã‚º protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnDestroy( void ); BOOL OnNotify( WPARAM, LPARAM ); @@ -74,12 +74,12 @@ class CDlgPrintSetting : public CDialog BOOL OnEnKillFocus( HWND hwndCtl, int wID ); LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - void OnChangeSettingType( BOOL ); /* Ý’è‚̃^ƒCƒv‚ª•Ï‚í‚Á‚½ */ - void OnSpin( int , BOOL ); /* ƒXƒsƒ“ƒRƒ“ƒgƒ[ƒ‹‚̈— */ - int DataCheckAndCorrect( int , int ); /* “ü—Í’l(”’l)‚̃Gƒ‰[ƒ`ƒFƒbƒN‚ð‚µ‚Ä³‚µ‚¢’l‚ð•Ô‚· */ - BOOL CalcPrintableLineAndColumn(); /* s”‚ÆŒ…”‚ðŒvŽZ */ - void UpdatePrintableLineAndColumn(); /* s”‚ÆŒ…”‚ÌŒvŽZ—v‹ */ - void SetFontName( int idTxt, int idUse, LOGFONT& lf, int nPointSize ); // ƒtƒHƒ“ƒg–¼/Žg—pƒ{ƒ^ƒ“‚ÌÝ’è + void OnChangeSettingType( BOOL ); /* 設定ã®ã‚¿ã‚¤ãƒ—ãŒå¤‰ã‚ã£ãŸ */ + void OnSpin( int , BOOL ); /* スピンコントロールã®å‡¦ç† */ + int DataCheckAndCorrect( int , int ); /* 入力値(数値)ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’ã—ã¦æ­£ã—ã„値を返㙠*/ + BOOL CalcPrintableLineAndColumn(); /* 行数ã¨æ¡æ•°ã‚’計算 */ + void UpdatePrintableLineAndColumn(); /* 行数ã¨æ¡æ•°ã®è¨ˆç®—è¦æ±‚ */ + void SetFontName( int idTxt, int idUse, LOGFONT& lf, int nPointSize ); // フォントå/使用ボタンã®è¨­å®š }; diff --git a/sakura_core/dlg/CDlgProfileMgr.cpp b/sakura_core/dlg/CDlgProfileMgr.cpp index ee98f68485..0d1312cc65 100644 --- a/sakura_core/dlg/CDlgProfileMgr.cpp +++ b/sakura_core/dlg/CDlgProfileMgr.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ƒvƒƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ +/*! @file + @brief プロファイルマãƒãƒ¼ã‚¸ãƒ£ @author Moca @date 2013.12.31 @@ -38,16 +38,16 @@ #include "sakura.hh" const DWORD p_helpids[] = { - IDC_LIST_PROFILE, HIDC_LIST_PROFILE, //ƒvƒƒtƒ@ƒCƒ‹ˆê—— - IDC_CHECK_PROF_DEFSTART, HIDC_CHECK_PROF_DEFSTART, //ƒfƒtƒHƒ‹ƒgÝ’è‚É‚µ‚Ä‹N“® - IDOK, HIDOK_PROFILEMGR, //‹N“® - IDCANCEL, HIDCANCEL_PROFILEMGR, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_PROFILEMGR_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_BUTTON_PROF_CREATE, HIDC_BUTTON_PROF_CREATE, //V‹Kì¬ - IDC_BUTTON_PROF_RENAME, HIDC_BUTTON_PROF_RENAME, //–¼‘O•ÏX - IDC_BUTTON_PROF_DELETE, HIDC_BUTTON_PROF_DELETE, //íœ - IDC_BUTTON_PROF_DEFSET, HIDC_BUTTON_PROF_DEFSET, //ƒfƒtƒHƒ‹ƒgÝ’è - IDC_BUTTON_PROF_DEFCLEAR, HIDC_BUTTON_PROF_DEFCLEAR, //ƒfƒtƒHƒ‹ƒg‰ðœ + IDC_LIST_PROFILE, HIDC_LIST_PROFILE, //プロファイル一覧 + IDC_CHECK_PROF_DEFSTART, HIDC_CHECK_PROF_DEFSTART, //デフォルト設定ã«ã—ã¦èµ·å‹• + IDOK, HIDOK_PROFILEMGR, //èµ·å‹• + IDCANCEL, HIDCANCEL_PROFILEMGR, //キャンセル + IDC_BUTTON_HELP, HIDC_PROFILEMGR_BUTTON_HELP, //ヘルプ + IDC_BUTTON_PROF_CREATE, HIDC_BUTTON_PROF_CREATE, //æ–°è¦ä½œæˆ + IDC_BUTTON_PROF_RENAME, HIDC_BUTTON_PROF_RENAME, //åå‰å¤‰æ›´ + IDC_BUTTON_PROF_DELETE, HIDC_BUTTON_PROF_DELETE, //削除 + IDC_BUTTON_PROF_DEFSET, HIDC_BUTTON_PROF_DEFSET, //デフォルト設定 + IDC_BUTTON_PROF_DEFCLEAR, HIDC_BUTTON_PROF_DEFCLEAR, //デフォルト解除 0, 0 }; @@ -57,7 +57,7 @@ CDlgProfileMgr::CDlgProfileMgr() return; } -/*! ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/*! モーダルダイアログã®è¡¨ç¤º */ int CDlgProfileMgr::DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam ) { return (int)CDialog::DoModal( hInstance, hwndParent, IDD_PROFILEMGR, lParam ); @@ -98,7 +98,7 @@ static std::tstring GetProfileMgrFileName(LPCTSTR profName = NULL) } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/*! ダイアログデータã®è¨­å®š */ void CDlgProfileMgr::SetData() { SetData( -1 ); @@ -158,7 +158,7 @@ static bool MyList_GetText(HWND hwndList, int index, TCHAR* szText) } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +/*! ダイアログデータã®å–å¾— */ int CDlgProfileMgr::GetData() { return GetData(true); @@ -230,7 +230,7 @@ BOOL CDlgProfileMgr::OnBnClicked( int wID ) break; case IDC_BUTTON_HELP: - /* uŒŸõv‚̃wƒ‹ƒv */ + /* 「検索ã€ã®ãƒ˜ãƒ«ãƒ— */ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_PROFILEMGR) ); break; @@ -388,7 +388,7 @@ void CDlgProfileMgr::RenameProf() return; } if( 0 == auto_strcmp( szTextOld, szText ) ){ - return; // –¢•ÏX + return; // 未変更 } std::wstring strText = to_wchar(szText); static const WCHAR szReservedChars[] = L"/\\*?<>&|:\"'\t"; @@ -410,13 +410,13 @@ void CDlgProfileMgr::RenameProf() std::tstring strProfDir = GetProfileMgrFileName(szText); if( IsFileExists(strProfDirOld.c_str(), false) ){ if( !IsFileExists(strProfDirOld.c_str(), true) ){ - // ƒvƒƒtƒ@ƒCƒ‹–¼‚̓fƒBƒŒƒNƒgƒŠ + // プロファイルåã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª if( FALSE == ::MoveFile( strProfDirOld.c_str(), strProfDir.c_str() ) ){ ErrorMessage( GetHwnd(), LS(STR_DLGPROFILE_ERR_RENAME) ); return; } }else{ - // ‹Œƒvƒƒtƒ@ƒCƒ‹–¼‚̓tƒ@ƒCƒ‹‚¾‚Á‚½‚Ì‚ÅV‹Kƒvƒƒtƒ@ƒCƒ‹‚Æ‚µ‚Ä쬊m”F + // 旧プロファイルåã¯ãƒ•ã‚¡ã‚¤ãƒ«ã ã£ãŸã®ã§æ–°è¦ãƒ—ロファイルã¨ã—ã¦ä½œæˆç¢ºèª if( IsFileExists(strProfDir.c_str(), true) ){ ErrorMessage( GetHwnd(), LS(STR_DLGPROFILE_ERR_FILE) ); return; @@ -479,7 +479,7 @@ static bool IOProfSettings( SProfileSettings& settings, bool bWrite ) for(int i = 0; i < nCount; i++){ wchar_t szKey[64]; std::tstring strProfName; - swprintf( szKey, L"P[%d]", i + 1 ); // 1ŠJŽn + swprintf( szKey, L"P[%d]", i + 1 ); // 1開始 if( bWrite ){ strProfName = settings.m_vProfList[i]; std::wstring wstrProfName = to_wchar(strProfName.c_str()); diff --git a/sakura_core/dlg/CDlgProfileMgr.h b/sakura_core/dlg/CDlgProfileMgr.h index 8611ff8eae..44c944fa21 100644 --- a/sakura_core/dlg/CDlgProfileMgr.h +++ b/sakura_core/dlg/CDlgProfileMgr.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒvƒƒtƒ@ƒCƒ‹ƒ}ƒl[ƒWƒƒ +/*! @file + @brief プロファイルマãƒãƒ¼ã‚¸ãƒ£ @author Moca @date 2013.12.31 @@ -52,17 +52,17 @@ class CDlgProfileMgr : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ protected: BOOL OnBnClicked( int ); INT_PTR DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ); - void SetData(); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - void SetData( int ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData(); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ - int GetData( bool ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData(); /* ダイアログデータã®è¨­å®š */ + void SetData( int ); /* ダイアログデータã®è¨­å®š */ + int GetData(); /* ダイアログデータã®å–å¾— */ + int GetData( bool ); /* ダイアログデータã®å–å¾— */ LPVOID GetHelpIdTable(void); void UpdateIni(); diff --git a/sakura_core/dlg/CDlgProperty.cpp b/sakura_core/dlg/CDlgProperty.cpp index fb856393f9..98c212214f 100644 --- a/sakura_core/dlg/CDlgProperty.cpp +++ b/sakura_core/dlg/CDlgProperty.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹ƒvƒƒpƒeƒBƒ_ƒCƒAƒƒO +/*! @file + @brief ファイルプロパティダイアログ @author Norio Nakatani */ @@ -46,18 +46,18 @@ #include "util/shell.h" #include "sakura_rc.h" -// ƒvƒƒpƒeƒB CDlgProperty.cpp //@@@ 2002.01.07 add start MIK +// プロパティ CDlgProperty.cpp //@@@ 2002.01.07 add start MIK #include "sakura.hh" const DWORD p_helpids[] = { //12600 IDOK, HIDOK_PROP, -// IDCANCEL, HIDCANCEL_PROP, // –¢Žg—p del 2008/7/4 Uchi +// IDCANCEL, HIDCANCEL_PROP, // 未使用 del 2008/7/4 Uchi IDC_BUTTON_HELP, HIDC_PROP_BUTTON_HELP, IDC_EDIT_PROPERTY, HIDC_PROP_EDIT1, // IDC_EDIT1->IDC_EDIT_PROPERTY 2008/7/3 Uchi // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgProperty::DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam ) { return (int)CDialog::DoModal( hInstance, hwndParent, IDD_PROPERTY_FILE, lParam ); @@ -67,26 +67,26 @@ BOOL CDlgProperty::OnBnClicked( int wID ) { switch( wID ){ case IDC_BUTTON_HELP: - /* uƒtƒ@ƒCƒ‹‚̃vƒƒpƒeƒBv‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_PROPERTY_FILE) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「ファイルã®ãƒ—ロパティã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_PROPERTY_FILE) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDOK: /* ‰ºŒŸõ */ - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + case IDOK: /* 下検索 */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), FALSE ); return TRUE; -// case IDCANCEL: // –¢Žg—p del 2008/7/4 Uchi +// case IDCANCEL: // 未使用 del 2008/7/4 Uchi // ::EndDialog( GetHwnd(), FALSE ); // return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è +/*! ダイアログデータã®è¨­å®š - @date 2002.2.17 YAZAKI CShareData‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ÍACProcess‚ɂЂƂ‚ ‚é‚Ì‚ÝB + @date 2002.2.17 YAZAKI CShareDataã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€CProcessã«ã²ã¨ã¤ã‚ã‚‹ã®ã¿ã€‚ */ void CDlgProperty::SetData( void ) { @@ -97,7 +97,7 @@ void CDlgProperty::SetData( void ) HANDLE nFind; WIN32_FIND_DATA wfd; - // Aug. 16, 2000 genta ‘SŠp‰» + // Aug. 16, 2000 genta 全角化 cmemProp.AppendString( LS(STR_DLGFLPROP_FILENAME) ); cmemProp.AppendString( pCEditDoc->m_cDocFile.GetFilePath() ); cmemProp.AppendString( _T("\r\n") ); @@ -126,7 +126,7 @@ void CDlgProperty::SetData( void ) cmemProp.AppendString( szWork ); if( CAppMode::getInstance()->IsViewMode() ){ - cmemProp.AppendString( LS(STR_DLGFLPROP_VIEW_MODE) ); // 2009.04.11 ryoji uã‘‚«‹ÖŽ~ƒ‚[ƒhv¨uƒrƒ…[ƒ‚[ƒhv + cmemProp.AppendString( LS(STR_DLGFLPROP_VIEW_MODE) ); // 2009.04.11 ryoji 「上書ãç¦æ­¢ãƒ¢ãƒ¼ãƒ‰ã€â†’「ビューモード〠} if( pCEditDoc->m_cDocEditor.IsModified() ){ cmemProp.AppendString( LS(STR_DLGFLPROP_MODIFIED) ); @@ -247,7 +247,7 @@ void CDlgProperty::SetData( void ) char* pBuf; int nBufLen; CNativeT ctext; - /* ƒƒ‚ƒŠŠm•Û & ƒtƒ@ƒCƒ‹“Ç‚Ýž‚Ý */ + /* ãƒ¡ãƒ¢ãƒªç¢ºä¿ & ファイル読ã¿è¾¼ã¿ */ hgData = NULL; CBinaryInputStream in(pCEditDoc->m_cDocFile.GetFilePath()); if(!in){ @@ -266,7 +266,7 @@ void CDlgProperty::SetData( void ) in.Read( pBuf, nBufLen ); in.Close(); - //CESI‚̃fƒoƒbƒOî•ñ + //CESIã®ãƒ‡ãƒãƒƒã‚°æƒ…å ± CESI::GetDebugInfo(pBuf,nBufLen,&ctext); cmemProp.AppendNativeData(ctext); diff --git a/sakura_core/dlg/CDlgProperty.h b/sakura_core/dlg/CDlgProperty.h index 52546271e7..f3c2c7fbed 100644 --- a/sakura_core/dlg/CDlgProperty.h +++ b/sakura_core/dlg/CDlgProperty.h @@ -1,9 +1,9 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹ƒvƒƒpƒeƒBƒ_ƒCƒAƒƒO +/*! @file + @brief ファイルプロパティダイアログ @author Norio Nakatani - @date 1999/02/31 V‹Kì¬ - @date 1999/12/05 Äì¬ + @date 1999/02/31 æ–°è¦ä½œæˆ + @date 1999/12/05 å†ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -36,18 +36,18 @@ class CDlgProperty; #include "dlg/CDialog.h" /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ class CDlgProperty : public CDialog { public: - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnBnClicked( int ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add }; /////////////////////////////////////////////////////////////////////// diff --git a/sakura_core/dlg/CDlgReplace.cpp b/sakura_core/dlg/CDlgReplace.cpp index 381c48a98b..7bf58206c8 100644 --- a/sakura_core/dlg/CDlgReplace.cpp +++ b/sakura_core/dlg/CDlgReplace.cpp @@ -1,14 +1,14 @@ -/*! @file - @brief ’uŠ·ƒ_ƒCƒAƒƒO +/*! @file + @brief ç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Norio Nakatani - @date 2001/06/23 N.Nakatani ’PŒê’PˆÊ‚ÅŒŸõ‚·‚é‹@”\‚ðŽÀ‘• + @date 2001/06/23 N.Nakatani å˜èªžå˜ä½ã§æ¤œç´¢ã™ã‚‹æ©Ÿèƒ½ã‚’実装 */ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, genta, Stonee, hor, YAZAKI Copyright (C) 2002, MIK, hor, novice, genta, aroka, YAZAKI - Copyright (C) 2006, ‚©‚ë‚Æ, ryoji + Copyright (C) 2006, ã‹ã‚ã¨, ryoji Copyright (C) 2007, ryoji Copyright (C) 2009, ryoji Copyright (C) 2012, Uchi @@ -24,52 +24,52 @@ #include "sakura_rc.h" #include "sakura.hh" -//’uŠ· CDlgReplace.cpp //@@@ 2002.01.07 add start MIK +//ç½®æ› CDlgReplace.cpp //@@@ 2002.01.07 add start MIK const DWORD p_helpids[] = { //11900 - IDC_BUTTON_SEARCHNEXT, HIDC_REP_BUTTON_SEARCHNEXT, //‰ºŒŸõ - IDC_BUTTON_SEARCHPREV, HIDC_REP_BUTTON_SEARCHPREV, //㌟õ - IDC_BUTTON_REPALCE, HIDC_REP_BUTTON_REPALCE, //’uŠ· - IDC_BUTTON_REPALCEALL, HIDC_REP_BUTTON_REPALCEALL, //‘S’uŠ· - IDCANCEL, HIDCANCEL_REP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_REP_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_CHK_PASTE, HIDC_REP_CHK_PASTE, //ƒNƒŠƒbƒvƒ{[ƒh‚©‚ç“\‚è•t‚¯ - IDC_CHK_WORD, HIDC_REP_CHK_WORD, //’PŒê’PˆÊ - IDC_CHK_LOHICASE, HIDC_REP_CHK_LOHICASE, //‘啶Žš¬•¶Žš - IDC_CHK_REGULAREXP, HIDC_REP_CHK_REGULAREXP, //³‹K•\Œ» - IDC_CHECK_NOTIFYNOTFOUND, HIDC_REP_CHECK_NOTIFYNOTFOUND, //Œ©‚‚©‚ç‚È‚¢‚Æ‚«‚É’Ê’m - IDC_CHECK_bAutoCloseDlgReplace, HIDC_REP_CHECK_bAutoCloseDlgReplace, //Ž©“®“I‚ɕ‚¶‚é - IDC_COMBO_TEXT, HIDC_REP_COMBO_TEXT, //’uŠ·‘O - IDC_COMBO_TEXT2, HIDC_REP_COMBO_TEXT2, //’uŠ·Œã - IDC_RADIO_REPLACE, HIDC_REP_RADIO_REPLACE, //’uŠ·‘ÎÛF’uŠ· - IDC_RADIO_INSERT, HIDC_REP_RADIO_INSERT, //’uŠ·‘ÎÛF‘}“ü - IDC_RADIO_ADD, HIDC_REP_RADIO_ADD, //’uŠ·‘ÎÛF’ljÁ - IDC_RADIO_LINEDELETE, HIDC_REP_RADIO_LINEDELETE, //’uŠ·‘ÎÛFsíœ - IDC_RADIO_SELECTEDAREA, HIDC_REP_RADIO_SELECTEDAREA, //”͈ÍF‘S‘Ì - IDC_RADIO_ALLAREA, HIDC_REP_RADIO_ALLAREA, //”͈ÍF‘I‘ð”ÍˆÍ - IDC_STATIC_JRE32VER, HIDC_REP_STATIC_JRE32VER, //³‹K•\Œ»ƒo[ƒWƒ‡ƒ“ - IDC_BUTTON_SETMARK, HIDC_REP_BUTTON_SETMARK, //2002.01.16 hor ŒŸõŠY“–s‚ðƒ}[ƒN - IDC_CHECK_SEARCHALL, HIDC_REP_CHECK_SEARCHALL, //2002.01.26 hor 擪i––”öj‚©‚çÄŒŸõ - IDC_CHECK_CONSECUTIVEALL, HIDC_REP_CHECK_CONSECUTIVEALL, //u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ // 2007.01.16 ryoji + IDC_BUTTON_SEARCHNEXT, HIDC_REP_BUTTON_SEARCHNEXT, //下検索 + IDC_BUTTON_SEARCHPREV, HIDC_REP_BUTTON_SEARCHPREV, //上検索 + IDC_BUTTON_REPALCE, HIDC_REP_BUTTON_REPALCE, //ç½®æ› + IDC_BUTTON_REPALCEALL, HIDC_REP_BUTTON_REPALCEALL, //å…¨ç½®æ› + IDCANCEL, HIDCANCEL_REP, //キャンセル + IDC_BUTTON_HELP, HIDC_REP_BUTTON_HELP, //ヘルプ + IDC_CHK_PASTE, HIDC_REP_CHK_PASTE, //クリップボードã‹ã‚‰è²¼ã‚Šä»˜ã‘ + IDC_CHK_WORD, HIDC_REP_CHK_WORD, //å˜èªžå˜ä½ + IDC_CHK_LOHICASE, HIDC_REP_CHK_LOHICASE, //大文字å°æ–‡å­— + IDC_CHK_REGULAREXP, HIDC_REP_CHK_REGULAREXP, //æ­£è¦è¡¨ç¾ + IDC_CHECK_NOTIFYNOTFOUND, HIDC_REP_CHECK_NOTIFYNOTFOUND, //見ã¤ã‹ã‚‰ãªã„ã¨ãã«é€šçŸ¥ + IDC_CHECK_bAutoCloseDlgReplace, HIDC_REP_CHECK_bAutoCloseDlgReplace, //自動的ã«é–‰ã˜ã‚‹ + IDC_COMBO_TEXT, HIDC_REP_COMBO_TEXT, //ç½®æ›å‰ + IDC_COMBO_TEXT2, HIDC_REP_COMBO_TEXT2, //ç½®æ›å¾Œ + IDC_RADIO_REPLACE, HIDC_REP_RADIO_REPLACE, //ç½®æ›å¯¾è±¡ï¼šç½®æ› + IDC_RADIO_INSERT, HIDC_REP_RADIO_INSERT, //ç½®æ›å¯¾è±¡ï¼šæŒ¿å…¥ + IDC_RADIO_ADD, HIDC_REP_RADIO_ADD, //ç½®æ›å¯¾è±¡ï¼šè¿½åŠ  + IDC_RADIO_LINEDELETE, HIDC_REP_RADIO_LINEDELETE, //ç½®æ›å¯¾è±¡ï¼šè¡Œå‰Šé™¤ + IDC_RADIO_SELECTEDAREA, HIDC_REP_RADIO_SELECTEDAREA, //範囲：全体 + IDC_RADIO_ALLAREA, HIDC_REP_RADIO_ALLAREA, //範囲：é¸æŠžç¯„囲 + IDC_STATIC_JRE32VER, HIDC_REP_STATIC_JRE32VER, //æ­£è¦è¡¨ç¾ãƒãƒ¼ã‚¸ãƒ§ãƒ³ + IDC_BUTTON_SETMARK, HIDC_REP_BUTTON_SETMARK, //2002.01.16 hor 検索該当行をマーク + IDC_CHECK_SEARCHALL, HIDC_REP_CHECK_SEARCHALL, //2002.01.26 hor 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ + IDC_CHECK_CONSECUTIVEALL, HIDC_REP_CHECK_CONSECUTIVEALL, //「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— // 2007.01.16 ryoji // IDC_STATIC, -1, 0, 0 }; //@@@ 2002.01.07 add end MIK CDlgReplace::CDlgReplace() { - m_sSearchOption.Reset(); // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_bConsecutiveAll = FALSE; // u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ // 2007.01.16 ryoji - m_bSelectedArea = FALSE; // ‘I‘ð”͈͓à’uŠ· - m_nReplaceTarget = 0; // ’uŠ·‘ÎÛ // 2001.12.03 hor - m_nPaste = FALSE; // “\‚è•t‚¯‚éH // 2001.12.03 hor - m_nReplaceCnt = 0; //‚·‚ׂĒuŠ·‚ÌŽÀsŒ‹‰Ê // 2002.02.08 hor - m_bCanceled = false; //‚·‚ׂĒuŠ·‚ð’†’f‚µ‚½‚© // 2002.02.08 hor + m_sSearchOption.Reset(); // 検索オプション + m_bConsecutiveAll = FALSE; // 「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— // 2007.01.16 ryoji + m_bSelectedArea = FALSE; // é¸æŠžç¯„å›²å†…ç½®æ› + m_nReplaceTarget = 0; // ç½®æ›å¯¾è±¡ // 2001.12.03 hor + m_nPaste = FALSE; // 貼り付ã‘る？ // 2001.12.03 hor + m_nReplaceCnt = 0; //ã™ã¹ã¦ç½®æ›ã®å®Ÿè¡Œçµæžœ // 2002.02.08 hor + m_bCanceled = false; //ã™ã¹ã¦ç½®æ›ã‚’中断ã—ãŸã‹ // 2002.02.08 hor return; } /*! - ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃hƒƒbƒvƒ_ƒEƒ“ƒƒbƒZ[ƒW‚ð•ß‘¨‚·‚é + コンボボックスã®ãƒ‰ãƒ­ãƒƒãƒ—ダウンメッセージをæ•æ‰ã™ã‚‹ - @date 2013.03.24 novice V‹Kì¬ + @date 2013.03.24 novice æ–°è¦ä½œæˆ */ BOOL CDlgReplace::OnCbnDropDown( HWND hwndCtl, int wID ) { @@ -94,20 +94,20 @@ BOOL CDlgReplace::OnCbnDropDown( HWND hwndCtl, int wID ) return CDialog::OnCbnDropDown( hwndCtl, wID ); } -/* ƒ‚[ƒhƒŒƒXƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モードレスダイアログã®è¡¨ç¤º */ HWND CDlgReplace::DoModeless( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam, BOOL bSelected ) { - m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - m_bConsecutiveAll = m_pShareData->m_Common.m_sSearch.m_bConsecutiveAll; // u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ // 2007.01.16 ryoji - m_bSelectedArea = m_pShareData->m_Common.m_sSearch.m_bSelectedArea; // ‘I‘ð”͈͓à’uŠ· - m_bNOTIFYNOTFOUND = m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND; // ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ + m_sSearchOption = m_pShareData->m_Common.m_sSearch.m_sSearchOption; // 検索オプション + m_bConsecutiveAll = m_pShareData->m_Common.m_sSearch.m_bConsecutiveAll; // 「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— // 2007.01.16 ryoji + m_bSelectedArea = m_pShareData->m_Common.m_sSearch.m_bSelectedArea; // é¸æŠžç¯„å›²å†…ç½®æ› + m_bNOTIFYNOTFOUND = m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND; // 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 m_bSelected = bSelected; - m_ptEscCaretPos_PHY = ((CEditView*)lParam)->GetCaret().GetCaretLogicPos(); // ŒŸõ/’uŠ·ŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u‘Þ”ð - ((CEditView*)lParam)->m_bSearch = TRUE; // ŒŸõ/’uŠ·ŠJŽnˆÊ’u‚Ì“o˜^—L–³ 02/07/28 ai + m_ptEscCaretPos_PHY = ((CEditView*)lParam)->GetCaret().GetCaretLogicPos(); // 検索/ç½®æ›é–‹å§‹æ™‚ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®é€€é¿ + ((CEditView*)lParam)->m_bSearch = TRUE; // 検索/ç½®æ›é–‹å§‹ä½ç½®ã®ç™»éŒ²æœ‰ç„¡ 02/07/28 ai return CDialog::DoModeless( hInstance, hwndParent, IDD_REPLACE, lParam, SW_SHOW ); } -/* ƒ‚[ƒhƒŒƒXŽžF’uŠ·EŒŸõ‘ÎÛ‚Æ‚È‚éƒrƒ…[‚Ì•ÏX */ +/* モードレス時：置æ›ãƒ»æ¤œç´¢å¯¾è±¡ã¨ãªã‚‹ãƒ“ューã®å¤‰æ›´ */ void CDlgReplace::ChangeView( LPARAM pcEditView ) { m_lParam = pcEditView; @@ -117,57 +117,57 @@ void CDlgReplace::ChangeView( LPARAM pcEditView ) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgReplace::SetData( void ) { - // ŒŸõ•¶Žš—ñ/’uŠ·Œã•¶Žš—ñƒŠƒXƒg‚ÌÝ’è(ŠÖ”‰») 2010/5/26 Uchi + // 検索文字列/ç½®æ›å¾Œæ–‡å­—列リストã®è¨­å®š(関数化) 2010/5/26 Uchi SetCombosList(); - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, m_sSearchOption.bLoHiCase ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_WORD, m_sSearchOption.bWordOnly ); - /* u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ // 2007.01.16 ryoji + /* 「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ // 2007.01.16 ryoji ::CheckDlgButton( GetHwnd(), IDC_CHECK_CONSECUTIVEALL, m_bConsecutiveAll ); // From Here Jun. 29, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ - // ˆ—ƒtƒ[‹y‚Ñ”»’èðŒ‚ÌŒ©’¼‚µB•K‚¸³‹K•\Œ»‚̃`ƒFƒbƒN‚Æ - // –³ŠÖŒW‚ÉCheckRegexpVersion‚ð’ʉ߂·‚é‚悤‚É‚µ‚½B + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— + // 処ç†ãƒ•ãƒ­ãƒ¼åŠã³åˆ¤å®šæ¡ä»¶ã®è¦‹ç›´ã—。必ãšæ­£è¦è¡¨ç¾ã®ãƒã‚§ãƒƒã‚¯ã¨ + // 無関係ã«CheckRegexpVersionを通éŽã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚ if( CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, false ) && m_sSearchOption.bRegularExp){ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 1 ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); } else { ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 0 ); - /*u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ + /*「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHECK_CONSECUTIVEALL ), FALSE ); // 2007.01.16 ryoji } // To Here Jun. 29, 2001 genta - /* ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND, m_bNOTIFYNOTFOUND ); - /* ’uŠ· ƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* ç½®æ› ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’è‡ªå‹•çš„ã«é–‰ã˜ã‚‹ */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_bAutoCloseDlgReplace, m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgReplace ); - /* 擪i––”öj‚©‚çÄŒŸõ 2002.01.26 hor */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ 2002.01.26 hor */ ::CheckDlgButton( GetHwnd(), IDC_CHECK_SEARCHALL, m_pShareData->m_Common.m_sSearch.m_bSearchAll ); // From Here 2001.12.03 hor - // ƒNƒŠƒbƒvƒ{[ƒh‚©‚ç“\‚è•t‚¯‚éH + // クリップボードã‹ã‚‰è²¼ã‚Šä»˜ã‘る？ ::CheckDlgButton( GetHwnd(), IDC_CHK_PASTE, m_nPaste ); - // ’uŠ·‘ÎÛ + // ç½®æ›å¯¾è±¡ if(m_nReplaceTarget==0){ ::CheckDlgButton( GetHwnd(), IDC_RADIO_REPLACE, TRUE ); }else @@ -189,13 +189,13 @@ void CDlgReplace::SetData( void ) -// ŒŸõ•¶Žš—ñ/’uŠ·Œã•¶Žš—ñƒŠƒXƒg‚ÌÝ’è +// 検索文字列/ç½®æ›å¾Œæ–‡å­—列リストã®è¨­å®š // 2010/5/26 Uchi void CDlgReplace::SetCombosList( void ) { HWND hwndCombo; - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ hwndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ); while (Combo_GetCount(hwndCombo) > 0) { Combo_DeleteString( hwndCombo, 0); @@ -208,7 +208,7 @@ void CDlgReplace::SetCombosList( void ) ::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_strText.c_str() ); } - /* ’uŠ·Œã•¶Žš—ñ */ + /* ç½®æ›å¾Œæ–‡å­—列 */ hwndCombo = ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ); while (Combo_GetCount(hwndCombo) > 0) { Combo_DeleteString( hwndCombo, 0); @@ -222,37 +222,37 @@ void CDlgReplace::SetCombosList( void ) } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* 0==ðŒ–¢“ü—Í 0‚æ‚è‘å‚«‚¢==³í 0‚æ‚謂³‚¢==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* 0==æ¡ä»¶æœªå…¥åŠ› 0より大ãã„==正常 0よりå°ã•ã„==入力エラー */ int CDlgReplace::GetData( void ) { - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ m_sSearchOption.bLoHiCase = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_LOHICASE )); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ m_sSearchOption.bWordOnly = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_WORD )); - /* u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ // 2007.01.16 ryoji + /* 「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ // 2007.01.16 ryoji m_bConsecutiveAll = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_CONSECUTIVEALL ); - /* ³‹K•\Œ» */ + /* æ­£è¦è¡¨ç¾ */ m_sSearchOption.bRegularExp = (0!=IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP )); - /* ‘I‘ð”͈͓à’uŠ· */ + /* é¸æŠžç¯„å›²å†…ç½®æ› */ m_bSelectedArea = ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_SELECTEDAREA ); - /* ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ + /* 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ m_bNOTIFYNOTFOUND = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_NOTIFYNOTFOUND ); - m_pShareData->m_Common.m_sSearch.m_bConsecutiveAll = m_bConsecutiveAll; // 1==u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ // 2007.01.16 ryoji - m_pShareData->m_Common.m_sSearch.m_bSelectedArea = m_bSelectedArea; // ‘I‘ð”͈͓à’uŠ· - m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = m_bNOTIFYNOTFOUND; // ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ + m_pShareData->m_Common.m_sSearch.m_bConsecutiveAll = m_bConsecutiveAll; // 1==「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— // 2007.01.16 ryoji + m_pShareData->m_Common.m_sSearch.m_bSelectedArea = m_bSelectedArea; // é¸æŠžç¯„å›²å†…ç½®æ› + m_pShareData->m_Common.m_sSearch.m_bNOTIFYNOTFOUND = m_bNOTIFYNOTFOUND; // 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 - /* ŒŸõ•¶Žš—ñ */ + /* 検索文字列 */ int nBufferSize = ::GetWindowTextLength( GetItemHwnd(IDC_COMBO_TEXT) ) + 1; std::vector vText(nBufferSize); ::DlgItem_GetText( GetHwnd(), IDC_COMBO_TEXT, &vText[0], nBufferSize); m_strText = to_wchar(&vText[0]); - /* ’uŠ·Œã•¶Žš—ñ */ + /* ç½®æ›å¾Œæ–‡å­—列 */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_LINEDELETE ) ){ m_strText2 = L""; }else{ @@ -262,30 +262,30 @@ int CDlgReplace::GetData( void ) m_strText2 = to_wchar(&vText[0]); } - /* ’uŠ· ƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* ç½®æ› ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’è‡ªå‹•çš„ã«é–‰ã˜ã‚‹ */ m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgReplace = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_bAutoCloseDlgReplace ); - /* 擪i––”öj‚©‚çÄŒŸõ 2002.01.26 hor */ + /* 先頭（末尾）ã‹ã‚‰å†æ¤œç´¢ 2002.01.26 hor */ m_pShareData->m_Common.m_sSearch.m_bSearchAll = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_SEARCHALL ); if( 0 < m_strText.size() ){ - /* ³‹K•\Œ»H */ + /* æ­£è¦è¡¨ç¾ï¼Ÿ */ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— int nFlag = 0x00; nFlag |= m_sSearchOption.bLoHiCase ? 0x01 : 0x00; if( m_sSearchOption.bRegularExp && !CheckRegexpSyntax( m_strText.c_str(), GetHwnd(), true, nFlag ) ){ return -1; } - // To Here Jun. 26, 2001 genta ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ·‚µ‘Ö‚¦ + // To Here Jun. 26, 2001 genta æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリ差ã—替㈠- /* ŒŸõ•¶Žš—ñ */ - //@@@ 2002.2.2 YAZAKI CShareData.AddToSearchKeyArr()’ljÁ‚É”º‚¤•ÏX + /* 検索文字列 */ + //@@@ 2002.2.2 YAZAKI CShareData.AddToSearchKeyArr()追加ã«ä¼´ã†å¤‰æ›´ if( m_strText.size() < _MAX_PATH ){ CSearchKeywordManager().AddToSearchKeyArr( m_strText.c_str() ); - m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ + m_pShareData->m_Common.m_sSearch.m_sSearchOption = m_sSearchOption; // 検索オプション } - // 2011.12.18 view‚É’¼ÚÝ’è + // 2011.12.18 viewã«ç›´æŽ¥è¨­å®š CEditView* pcEditView = (CEditView*)m_lParam; if( pcEditView->m_strCurSearchKey == m_strText && pcEditView->m_sCurSearchOption == m_sSearchOption ){ }else{ @@ -295,18 +295,18 @@ int CDlgReplace::GetData( void ) } pcEditView->m_nCurSearchKeySequence = GetDllShareData().m_Common.m_sSearch.m_nSearchKeySequence; - /* ’uŠ·Œã•¶Žš—ñ */ - //@@@ 2002.2.2 YAZAKI CShareData.AddToReplaceKeyArr()’ljÁ‚É”º‚¤•ÏX + /* ç½®æ›å¾Œæ–‡å­—列 */ + //@@@ 2002.2.2 YAZAKI CShareData.AddToReplaceKeyArr()追加ã«ä¼´ã†å¤‰æ›´ if( m_strText2.size() < _MAX_PATH ){ CSearchKeywordManager().AddToReplaceKeyArr( m_strText2.c_str() ); } m_nReplaceKeySequence = GetDllShareData().m_Common.m_sSearch.m_nReplaceKeySequence; // From Here 2001.12.03 hor - // ƒNƒŠƒbƒvƒ{[ƒh‚©‚ç“\‚è•t‚¯‚éH + // クリップボードã‹ã‚‰è²¼ã‚Šä»˜ã‘る？ m_nPaste=IsDlgButtonChecked( GetHwnd(), IDC_CHK_PASTE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ), !m_nPaste ); - // ’uŠ·‘ÎÛ + // ç½®æ›å¯¾è±¡ m_nReplaceTarget=0; if(::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_INSERT )){ m_nReplaceTarget=1; @@ -322,7 +322,7 @@ int CDlgReplace::GetData( void ) // To Here 2001.12.03 hor - // ŒŸõ•¶Žš—ñ/’uŠ·Œã•¶Žš—ñƒŠƒXƒg‚ÌÝ’è 2010/5/26 Uchi + // 検索文字列/ç½®æ›å¾Œæ–‡å­—列リストã®è¨­å®š 2010/5/26 Uchi if (!m_bModal) { SetCombosList(); } @@ -339,28 +339,28 @@ BOOL CDlgReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { _SetHwnd( hwndDlg ); // Jun. 26, 2001 genta - // ‚±‚̈ʒu‚ų‹K•\Œ»‚̉Šú‰»‚ð‚·‚é•K—v‚Í‚È‚¢ - // ‘¼‚Ƃ̈êŠÑ«‚ð•Û‚‚½‚ßíœ + // ã“ã®ä½ç½®ã§æ­£è¦è¡¨ç¾ã®åˆæœŸåŒ–ã‚’ã™ã‚‹å¿…è¦ã¯ãªã„ + // ä»–ã¨ã®ä¸€è²«æ€§ã‚’ä¿ã¤ãŸã‚削除 - /* ƒ†[ƒU[‚ªƒRƒ“ƒ{ ƒ{ƒbƒNƒX‚̃GƒfƒBƒbƒg ƒRƒ“ƒgƒ[ƒ‹‚É“ü—Í‚Å‚«‚éƒeƒLƒXƒg‚Ì’·‚³‚ð§ŒÀ‚·‚é */ + /* ユーザーãŒã‚³ãƒ³ãƒœ ボックスã®ã‚¨ãƒ‡ã‚£ãƒƒãƒˆ コントロールã«å…¥åŠ›ã§ãるテキストã®é•·ã•ã‚’制é™ã™ã‚‹ */ // Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), _MAX_PATH - 1 ); // Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ), _MAX_PATH - 1 ); - /* ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é */ + /* コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ */ Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT ), TRUE ); Combo_SetExtendedUI( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ), TRUE ); - /* ƒeƒLƒXƒg‘I‘𒆂© */ + /* テキストé¸æŠžä¸­ã‹ */ if( m_bSelected ){ - ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_SEARCHPREV ), FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg‰ðœ - ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_SEARCHNEXT ), FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg‰ðœ - ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_REPALCE ), FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg‰ðœ + ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_SEARCHPREV ), FALSE ); // 2001.12.03 hor コメント解除 + ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_SEARCHNEXT ), FALSE ); // 2001.12.03 hor コメント解除 + ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_BUTTON_REPALCE ), FALSE ); // 2001.12.03 hor コメント解除 ::CheckDlgButton( GetHwnd(), IDC_RADIO_SELECTEDAREA, TRUE ); -// ::CheckDlgButton( GetHwnd(), IDC_RADIO_ALLAREA, FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg +// ::CheckDlgButton( GetHwnd(), IDC_RADIO_ALLAREA, FALSE ); // 2001.12.03 hor コメント }else{ -// ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_RADIO_SELECTEDAREA ), FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg -// ::CheckDlgButton( GetHwnd(), IDC_RADIO_SELECTEDAREA, FALSE ); // 2001.12.03 hor ƒRƒƒ“ƒg +// ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_RADIO_SELECTEDAREA ), FALSE ); // 2001.12.03 hor コメント +// ::CheckDlgButton( GetHwnd(), IDC_RADIO_SELECTEDAREA, FALSE ); // 2001.12.03 hor コメント ::CheckDlgButton( GetHwnd(), IDC_RADIO_ALLAREA, TRUE ); } @@ -371,7 +371,7 @@ BOOL CDlgReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_comboDelText2.pRecent = &m_cRecentReplace; SetComboBoxDeleter(GetItemHwnd(IDC_COMBO_TEXT2), &m_comboDelText2); - // ƒtƒHƒ“ƒgÝ’è 2012/11/27 Uchi + // フォント設定 2012/11/27 Uchi HFONT hFontOld = (HFONT)::SendMessageAny( GetItemHwnd( IDC_COMBO_TEXT ), WM_GETFONT, 0, 0 ); HFONT hFont = SetMainFont( GetItemHwnd( IDC_COMBO_TEXT ) ); m_cFontText.SetFont( hFontOld, hFont, GetItemHwnd( IDC_COMBO_TEXT ) ); @@ -380,7 +380,7 @@ BOOL CDlgReplace::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) hFont = SetMainFont( GetItemHwnd( IDC_COMBO_TEXT2 ) ); m_cFontText2.SetFont( hFontOld, hFont, GetItemHwnd( IDC_COMBO_TEXT2 ) ); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnInitDialog( hwndDlg, wParam, lParam ); } @@ -404,7 +404,7 @@ BOOL CDlgReplace::OnBnClicked( int wID ) switch( wID ){ case IDC_CHK_PASTE: - /* ƒeƒLƒXƒg‚Ì“\‚è•t‚¯ */ + /* テキストã®è²¼ã‚Šä»˜ã‘ */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_PASTE ) && !pcEditView->m_pcEditDoc->m_cDocEditor.IsEnablePaste() ){ OkMessage( GetHwnd(), LS(STR_DLGREPLC_CLIPBOARD) ); @@ -412,7 +412,7 @@ BOOL CDlgReplace::OnBnClicked( int wID ) } ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_COMBO_TEXT2 ), !(::IsDlgButtonChecked( GetHwnd(), IDC_CHK_PASTE)) ); return TRUE; - // ’uŠ·‘ÎÛ + // ç½®æ›å¯¾è±¡ case IDC_RADIO_REPLACE: case IDC_RADIO_INSERT: case IDC_RADIO_ADD: @@ -426,7 +426,7 @@ BOOL CDlgReplace::OnBnClicked( int wID ) } return TRUE; case IDC_RADIO_SELECTEDAREA: - /* ”ÍˆÍ”ÍˆÍ */ + /* 範囲範囲 */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_ALLAREA ) ){ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_SEARCHPREV ), TRUE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_SEARCHNEXT ), TRUE ); @@ -438,7 +438,7 @@ BOOL CDlgReplace::OnBnClicked( int wID ) } return TRUE; case IDC_RADIO_ALLAREA: - /* ƒtƒ@ƒCƒ‹‘S‘Ì */ + /* ファイル全体 */ if( ::IsDlgButtonChecked( GetHwnd(), IDC_RADIO_ALLAREA ) ){ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_SEARCHPREV ), TRUE ); ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_BUTTON_SEARCHNEXT ), TRUE ); @@ -451,56 +451,56 @@ BOOL CDlgReplace::OnBnClicked( int wID ) return TRUE; // To Here 2001.12.03 hor case IDC_BUTTON_HELP: - /* u’uŠ·v‚̃wƒ‹ƒv */ - //Stonee, 2001/03/12 ‘æŽlˆø”‚ðA‹@”\”Ô†‚©‚çƒwƒ‹ƒvƒgƒsƒbƒN”Ô†‚𒲂ׂé‚悤‚É‚µ‚½ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_REPLACE_DIALOG) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* 「置æ›ã€ã®ãƒ˜ãƒ«ãƒ— */ + //Stonee, 2001/03/12 第四引数をã€æ©Ÿèƒ½ç•ªå·ã‹ã‚‰ãƒ˜ãƒ«ãƒ—トピック番å·ã‚’調ã¹ã‚‹ã‚ˆã†ã«ã—㟠+ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_REPLACE_DIALOG) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; -// case IDC_CHK_LOHICASE: /* ‘啶Žš‚Ƭ•¶Žš‚ð‹æ•Ê‚·‚é */ +// case IDC_CHK_LOHICASE: /* 大文字ã¨å°æ–‡å­—を区別ã™ã‚‹ */ // MYTRACE( _T("IDC_CHK_LOHICASE\n") ); // return TRUE; -// case IDC_CHK_WORDONLY: /* ˆê’v‚·‚é’PŒê‚Ì‚ÝŒŸõ */ +// case IDC_CHK_WORDONLY: /* 一致ã™ã‚‹å˜èªžã®ã¿æ¤œç´¢ */ // MYTRACE( _T("IDC_CHK_WORDONLY\n") ); // break; - case IDC_CHK_REGULAREXP: /* ³‹K•\Œ» */ + case IDC_CHK_REGULAREXP: /* æ­£è¦è¡¨ç¾ */ // MYTRACE( _T("IDC_CHK_REGULAREXP ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) = %d\n"), ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ); if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHK_REGULAREXP ) ){ // From Here Jun. 26, 2001 genta - // ³‹K•\Œ»ƒ‰ƒCƒuƒ‰ƒŠ‚Ì·‚µ‘Ö‚¦‚É”º‚¤ˆ—‚ÌŒ©’¼‚µ + // æ­£è¦è¡¨ç¾ãƒ©ã‚¤ãƒ–ラリã®å·®ã—替ãˆã«ä¼´ã†å‡¦ç†ã®è¦‹ç›´ã— if( !CheckRegexpVersion( GetHwnd(), IDC_STATIC_JRE32VER, true ) ){ ::CheckDlgButton( GetHwnd(), IDC_CHK_REGULAREXP, 0 ); }else{ // To Here Jun. 26, 2001 genta - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ // Jan. 31, 2002 genta - // ‘啶ŽšE¬•¶Žš‚Ì‹æ•Ê‚ͳ‹K•\Œ»‚ÌÝ’è‚ÉŠÖ‚í‚炸•Û‘¶‚·‚é + // 大文字・å°æ–‡å­—ã®åŒºåˆ¥ã¯æ­£è¦è¡¨ç¾ã®è¨­å®šã«é–¢ã‚らãšä¿å­˜ã™ã‚‹ //::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 1 ); //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), FALSE ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), FALSE ); - /*u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ + /*「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHECK_CONSECUTIVEALL ), TRUE ); // 2007.01.16 ryoji } }else{ - /* ‰p‘啶Žš‚Ɖp¬•¶Žš‚ð‹æ•Ê‚·‚é */ + /* 英大文字ã¨è‹±å°æ–‡å­—を区別ã™ã‚‹ */ //::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_LOHICASE ), TRUE ); // Jan. 31, 2002 genta - // ‘啶ŽšE¬•¶Žš‚Ì‹æ•Ê‚ͳ‹K•\Œ»‚ÌÝ’è‚ÉŠÖ‚í‚炸•Û‘¶‚·‚é + // 大文字・å°æ–‡å­—ã®åŒºåˆ¥ã¯æ­£è¦è¡¨ç¾ã®è¨­å®šã«é–¢ã‚らãšä¿å­˜ã™ã‚‹ //::CheckDlgButton( GetHwnd(), IDC_CHK_LOHICASE, 0 ); // 2001/06/23 N.Nakatani - /* ’PŒê’PˆÊ‚Å’T‚· */ + /* å˜èªžå˜ä½ã§æŽ¢ã™ */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHK_WORD ), TRUE ); - /*u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ + /*「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ ::EnableWindow( ::GetDlgItem( GetHwnd(), IDC_CHECK_CONSECUTIVEALL ), FALSE ); // 2007.01.16 ryoji } return TRUE; -// case IDOK: /* ‰ºŒŸõ */ -// /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ +// case IDOK: /* 下検索 */ +// /* ダイアログデータã®å–å¾— */ // nRet = GetData(); // if( 0 < nRet ){ // ::EndDialog( hwndDlg, 2 ); @@ -511,46 +511,46 @@ BOOL CDlgReplace::OnBnClicked( int wID ) // return TRUE; - case IDC_BUTTON_SEARCHPREV: /* ㌟õ */ + case IDC_BUTTON_SEARCHPREV: /* 上検索 */ nRet = GetData(); if( 0 < nRet ){ - // ŒŸõŠJŽnˆÊ’u‚ð“o˜^ 02/07/28 ai start + // 検索開始ä½ç½®ã‚’登録 02/07/28 ai start if( FALSE != pcEditView->m_bSearch ){ pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; }// 02/07/28 ai end - /* ƒRƒ}ƒ“ƒhƒR[ƒh‚É‚æ‚鈗U‚蕪‚¯ */ - /* ‘O‚ðŒŸõ */ + /* コマンドコードã«ã‚ˆã‚‹å‡¦ç†æŒ¯ã‚Šåˆ†ã‘ */ + /* å‰ã‚’検索 */ pcEditView->GetCommander().HandleCommand( F_SEARCH_PREV, true, (LPARAM)GetHwnd(), 0, 0, 0 ); - /* Ä•`‰æi0•¶Žš•ƒ}ƒbƒ`‚ŃLƒƒƒŒƒbƒg‚ð•\Ž¦‚·‚邽‚ßj */ - pcEditView->Redraw(); // ‘O‰ñ0•¶Žš•ƒ}ƒbƒ`‚ÌÁ‹Ž‚É‚à•K—v + /* å†æ画（0文字幅マッãƒã§ã‚­ãƒ£ãƒ¬ãƒƒãƒˆã‚’表示ã™ã‚‹ãŸã‚） */ + pcEditView->Redraw(); // å‰å›ž0文字幅マッãƒã®æ¶ˆåŽ»ã«ã‚‚å¿…è¦ }else if(nRet == 0){ OkMessage( GetHwnd(), LS(STR_DLGREPLC_STR) ); } return TRUE; - case IDC_BUTTON_SEARCHNEXT: /* ‰ºŒŸõ */ + case IDC_BUTTON_SEARCHNEXT: /* 下検索 */ nRet = GetData(); if( 0 < nRet ){ - // ŒŸõŠJŽnˆÊ’u‚ð“o˜^ 02/07/28 ai start + // 検索開始ä½ç½®ã‚’登録 02/07/28 ai start if( FALSE != pcEditView->m_bSearch ){ pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; }// 02/07/28 ai end - /* ƒRƒ}ƒ“ƒhƒR[ƒh‚É‚æ‚鈗U‚蕪‚¯ */ - /* ŽŸ‚ðŒŸõ */ + /* コマンドコードã«ã‚ˆã‚‹å‡¦ç†æŒ¯ã‚Šåˆ†ã‘ */ + /* 次を検索 */ pcEditView->GetCommander().HandleCommand( F_SEARCH_NEXT, true, (LPARAM)GetHwnd(), 0, 0, 0 ); - /* Ä•`‰æi0•¶Žš•ƒ}ƒbƒ`‚ŃLƒƒƒŒƒbƒg‚ð•\Ž¦‚·‚邽‚ßj */ - pcEditView->Redraw(); // ‘O‰ñ0•¶Žš•ƒ}ƒbƒ`‚ÌÁ‹Ž‚É‚à•K—v + /* å†æ画（0文字幅マッãƒã§ã‚­ãƒ£ãƒ¬ãƒƒãƒˆã‚’表示ã™ã‚‹ãŸã‚） */ + pcEditView->Redraw(); // å‰å›ž0文字幅マッãƒã®æ¶ˆåŽ»ã«ã‚‚å¿…è¦ }else if(nRet == 0){ OkMessage( GetHwnd(), LS(STR_DLGREPLC_STR) ); } return TRUE; - case IDC_BUTTON_SETMARK: //2002.01.16 hor ŠY“–sƒ}[ƒN + case IDC_BUTTON_SETMARK: //2002.01.16 hor 該当行マーク nRet = GetData(); if( 0 < nRet ){ pcEditView->GetCommander().HandleCommand( F_BOOKMARK_PATTERN, false, 0, 0, 0, 0 ); @@ -558,50 +558,50 @@ BOOL CDlgReplace::OnBnClicked( int wID ) } return TRUE; - case IDC_BUTTON_REPALCE: /* ’uŠ· */ + case IDC_BUTTON_REPALCE: /* ç½®æ› */ nRet = GetData(); if( 0 < nRet ){ - // ’uŠ·ŠJŽnˆÊ’u‚ð“o˜^ 02/07/28 ai start + // ç½®æ›é–‹å§‹ä½ç½®ã‚’登録 02/07/28 ai start if( FALSE != pcEditView->m_bSearch ){ pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; }// 02/07/28 ai end - /* ’uŠ· */ - //@@@ 2002.2.2 YAZAKI ’uŠ·ƒRƒ}ƒ“ƒh‚ðCEditView‚ÉVÝ - //@@@ 2002/04/08 YAZAKI eƒEƒBƒ“ƒhƒE‚̃nƒ“ƒhƒ‹‚ð“n‚·‚悤‚É•ÏXB + /* ç½®æ› */ + //@@@ 2002.2.2 YAZAKI ç½®æ›ã‚³ãƒžãƒ³ãƒ‰ã‚’CEditViewã«æ–°è¨­ + //@@@ 2002/04/08 YAZAKI 親ウィンドウã®ãƒãƒ³ãƒ‰ãƒ«ã‚’渡ã™ã‚ˆã†ã«å¤‰æ›´ã€‚ pcEditView->GetCommander().HandleCommand( F_REPLACE, true, (LPARAM)GetHwnd(), 0, 0, 0 ); - /* Ä•`‰æ */ + /* å†æç”» */ pcEditView->GetCommander().HandleCommand( F_REDRAW, true, 0, 0, 0, 0 ); }else if(nRet == 0){ OkMessage( GetHwnd(), LS(STR_DLGREPLC_STR) ); } return TRUE; - case IDC_BUTTON_REPALCEALL: /* ‚·‚ׂĒuŠ· */ + case IDC_BUTTON_REPALCEALL: /* ã™ã¹ã¦ç½®æ› */ nRet = GetData(); if( 0 < nRet ){ - // ’uŠ·ŠJŽnˆÊ’u‚ð“o˜^ 02/07/28 ai start + // ç½®æ›é–‹å§‹ä½ç½®ã‚’登録 02/07/28 ai start if( FALSE != pcEditView->m_bSearch ){ pcEditView->m_ptSrchStartPos_PHY = m_ptEscCaretPos_PHY; pcEditView->m_bSearch = FALSE; }// 02/07/28 ai end - /* ‚·‚ׂÄs’uŠ·Žž‚̈’u‚Íu‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µƒIƒvƒVƒ‡ƒ“OFF‚Ìꇂɂµ‚Äíœ 2007.01.16 ryoji */ + /* ã™ã¹ã¦è¡Œç½®æ›æ™‚ã®å‡¦ç½®ã¯ã€Œã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã—オプションOFFã®å ´åˆã«ã—ã¦å‰Šé™¤ 2007.01.16 ryoji */ pcEditView->GetCommander().HandleCommand( F_REPLACE_ALL, true, 0, 0, 0, 0 ); pcEditView->GetCommander().HandleCommand( F_REDRAW, true, 0, 0, 0, 0 ); - /* ƒAƒNƒeƒBƒu‚É‚·‚é */ + /* アクティブã«ã™ã‚‹ */ ActivateFrameWindow( GetHwnd() ); TopOkMessage( GetHwnd(), LS(STR_DLGREPLC_REPLACE), m_nReplaceCnt); if( !m_bCanceled ){ - if( m_bModal ){ /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚© */ - /* ’uŠ·ƒ_ƒCƒAƒƒO‚ð•Â‚¶‚é */ + if( m_bModal ){ /* モーダルダイアログ㋠*/ + /* ç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’é–‰ã˜ã‚‹ */ ::EndDialog( GetHwnd(), 0 ); }else{ - /* ’uŠ· ƒ_ƒCƒAƒƒO‚ðŽ©“®“I‚ɕ‚¶‚é */ + /* ç½®æ› ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ã‚’è‡ªå‹•çš„ã«é–‰ã˜ã‚‹ */ if( m_pShareData->m_Common.m_sSearch.m_bAutoCloseDlgReplace ){ ::DestroyWindow( GetHwnd() ); } @@ -617,17 +617,17 @@ BOOL CDlgReplace::OnBnClicked( int wID ) // return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } BOOL CDlgReplace::OnActivate( WPARAM wParam, LPARAM lParam ) { - // 0•¶Žš•ƒ}ƒbƒ`•`‰æ‚ÌON/OFF // 2009.11.29 ryoji + // 0文字幅マッãƒæç”»ã®ON/OFF // 2009.11.29 ryoji CEditView* pcEditView = (CEditView*)m_lParam; CLayoutRange cRangeSel = pcEditView->GetSelectionInfo().m_sSelect; if( cRangeSel.IsValid() && cRangeSel.IsLineOne() && cRangeSel.IsOne() ) - pcEditView->InvalidateRect(NULL); // ƒAƒNƒeƒBƒu‰»^”ñƒAƒNƒeƒBƒu‰»‚ªŠ®—¹‚µ‚Ä‚©‚çÄ•`‰æ + pcEditView->InvalidateRect(NULL); // アクティブ化ï¼éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ãŒå®Œäº†ã—ã¦ã‹ã‚‰å†æç”» return CDialog::OnActivate(wParam, lParam); } diff --git a/sakura_core/dlg/CDlgReplace.h b/sakura_core/dlg/CDlgReplace.h index 5c1abaa21d..b2cb2e805e 100644 --- a/sakura_core/dlg/CDlgReplace.h +++ b/sakura_core/dlg/CDlgReplace.h @@ -1,8 +1,8 @@ -/*! @file - @brief ’uŠ·ƒ_ƒCƒAƒƒO +/*! @file + @brief ç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Norio Nakatani - @date 1998/10/02 V‹Kì¬ + @date 1998/10/02 æ–°è¦ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani @@ -23,10 +23,10 @@ #include "util/window.h" /*----------------------------------------------------------------------- -ƒNƒ‰ƒX‚Ì錾 +クラスã®å®£è¨€ -----------------------------------------------------------------------*/ /*! - @brief ’uŠ·ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief ç½®æ›ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ */ class CDlgReplace : public CDialog { @@ -38,23 +38,23 @@ class CDlgReplace : public CDialog /* || Attributes & Operations */ - HWND DoModeless( HINSTANCE, HWND, LPARAM, BOOL ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ - void ChangeView( LPARAM ); /* ƒ‚[ƒhƒŒƒXŽžF’uŠ·EŒŸõ‘ÎÛ‚Æ‚È‚éƒrƒ…[‚Ì•ÏX */ - - SSearchOption m_sSearchOption; // ŒŸõƒIƒvƒVƒ‡ƒ“ - int m_bConsecutiveAll; /* u‚·‚ׂĒuŠ·v‚Í’uŠ·‚ÌŒJ•Ô‚µ */ // 2007.01.16 ryoji - std::wstring m_strText; // ŒŸõ•¶Žš—ñ - std::wstring m_strText2; // ’uŠ·Œã•¶Žš—ñ - int m_nReplaceKeySequence; //’uŠ·ŒãƒV[ƒPƒ“ƒX - BOOL m_bSelectedArea; /* ‘I‘ð”͈͓à’uŠ· */ - int m_bNOTIFYNOTFOUND; /* ŒŸõ^’uŠ· Œ©‚‚©‚ç‚È‚¢‚Æ‚«ƒƒbƒZ[ƒW‚ð•\Ž¦ */ - BOOL m_bSelected; /* ƒeƒLƒXƒg‘I‘𒆂© */ - int m_nReplaceTarget; /* ’uŠ·‘ÎÛ */ // 2001.12.03 hor - int m_nPaste; /* “\‚è•t‚¯H */ // 2001.12.03 hor - int m_nReplaceCnt; //‚·‚ׂĒuŠ·‚ÌŽÀsŒ‹‰Ê // 2002.02.08 hor - bool m_bCanceled; //‚·‚ׂĒuŠ·‚Å’†’f‚µ‚½‚© // 2002.02.08 hor - - CLogicPoint m_ptEscCaretPos_PHY; // ŒŸõ/’uŠ·ŠJŽnŽž‚̃J[ƒ\ƒ‹ˆÊ’u‘Þ”ðƒGƒŠƒA + HWND DoModeless( HINSTANCE, HWND, LPARAM, BOOL ); /* モーダルダイアログã®è¡¨ç¤º */ + void ChangeView( LPARAM ); /* モードレス時：置æ›ãƒ»æ¤œç´¢å¯¾è±¡ã¨ãªã‚‹ãƒ“ューã®å¤‰æ›´ */ + + SSearchOption m_sSearchOption; // 検索オプション + int m_bConsecutiveAll; /* 「ã™ã¹ã¦ç½®æ›ã€ã¯ç½®æ›ã®ç¹°è¿”ã— */ // 2007.01.16 ryoji + std::wstring m_strText; // 検索文字列 + std::wstring m_strText2; // ç½®æ›å¾Œæ–‡å­—列 + int m_nReplaceKeySequence; //ç½®æ›å¾Œã‚·ãƒ¼ã‚±ãƒ³ã‚¹ + BOOL m_bSelectedArea; /* é¸æŠžç¯„å›²å†…ç½®æ› */ + int m_bNOTIFYNOTFOUND; /* 検索ï¼ç½®æ› 見ã¤ã‹ã‚‰ãªã„ã¨ãメッセージを表示 */ + BOOL m_bSelected; /* テキストé¸æŠžä¸­ã‹ */ + int m_nReplaceTarget; /* ç½®æ›å¯¾è±¡ */ // 2001.12.03 hor + int m_nPaste; /* 貼り付ã‘？ */ // 2001.12.03 hor + int m_nReplaceCnt; //ã™ã¹ã¦ç½®æ›ã®å®Ÿè¡Œçµæžœ // 2002.02.08 hor + bool m_bCanceled; //ã™ã¹ã¦ç½®æ›ã§ä¸­æ–­ã—ãŸã‹ // 2002.02.08 hor + + CLogicPoint m_ptEscCaretPos_PHY; // 検索/ç½®æ›é–‹å§‹æ™‚ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½®é€€é¿ã‚¨ãƒªã‚¢ protected: CRecentSearch m_cRecentSearch; @@ -65,7 +65,7 @@ class CDlgReplace : public CDialog CFontAutoDeleter m_cFontText2; /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnCbnDropDown( HWND hwndCtl, int wID ); BOOL OnInitDialog( HWND, WPARAM, LPARAM ); @@ -74,9 +74,9 @@ class CDlgReplace : public CDialog BOOL OnActivate( WPARAM wParam, LPARAM lParam ); // 2009.11.29 ryoji LPVOID GetHelpIdTable(void); //@@@ 2002.01.18 add - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - void SetCombosList( void ); /* ŒŸõ•¶Žš—ñ/’uŠ·Œã•¶Žš—ñƒŠƒXƒg‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + void SetCombosList( void ); /* 検索文字列/ç½®æ›å¾Œæ–‡å­—列リストã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ }; diff --git a/sakura_core/dlg/CDlgSetCharSet.cpp b/sakura_core/dlg/CDlgSetCharSet.cpp index 8e680cd525..6704a30222 100644 --- a/sakura_core/dlg/CDlgSetCharSet.cpp +++ b/sakura_core/dlg/CDlgSetCharSet.cpp @@ -1,8 +1,8 @@ -/*! @file - @brief •¶ŽšƒR[ƒhƒZƒbƒgÝ’èƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 文字コードセット設定ダイアログボックス @author Uchi - @date 2010/6/14 V‹Kì¬ + @date 2010/6/14 æ–°è¦ä½œæˆ */ /* Copyright (C) 2010, Uchi @@ -19,13 +19,13 @@ #include "sakura_rc.h" #include "sakura.hh" -//•¶ŽšƒR[ƒhƒZƒbƒgÝ’è CDlgSetCharSet +//文字コードセット設定 CDlgSetCharSet const DWORD p_helpids[] = { - IDOK, HIDOK_GREP, //ŒŸõ - IDCANCEL, HIDCANCEL_GREP, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_GREP_BUTTON_HELP, //ƒwƒ‹ƒv - IDC_COMBO_CHARSET, HIDC_OPENDLG_COMBO_CODE, //•¶ŽšƒR[ƒhƒZƒbƒg - IDC_CHECK_BOM, HIDC_OPENDLG_CHECK_BOM, //ðŒ + IDOK, HIDOK_GREP, //検索 + IDCANCEL, HIDCANCEL_GREP, //キャンセル + IDC_BUTTON_HELP, HIDC_GREP_BUTTON_HELP, //ヘルプ + IDC_COMBO_CHARSET, HIDC_OPENDLG_COMBO_CODE, //文字コードセット + IDC_CHECK_BOM, HIDC_OPENDLG_CHECK_BOM, //æ¡ä»¶ IDC_CHECK_CP, HIDC_OPENDLG_CHECK_CP, //CP 0, 0 }; @@ -34,17 +34,17 @@ const DWORD p_helpids[] = { CDlgSetCharSet::CDlgSetCharSet() { - m_pnCharSet = NULL; // •¶ŽšƒR[ƒhƒZƒbƒg - m_pbBom = NULL; // •¶ŽšƒR[ƒhƒZƒbƒg + m_pnCharSet = NULL; // 文字コードセット + m_pbBom = NULL; // 文字コードセット m_bCP = false; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgSetCharSet::DoModal( HINSTANCE hInstance, HWND hwndParent, ECodeType* pnCharSet, bool* pbBom) { - m_pnCharSet = pnCharSet; // •¶ŽšƒR[ƒhƒZƒbƒg + m_pnCharSet = pnCharSet; // 文字コードセット m_pbBom = pbBom; // BOM return (int)CDialog::DoModal( hInstance, hwndParent, IDD_SETCHARSET, (LPARAM)NULL ); @@ -56,13 +56,13 @@ BOOL CDlgSetCharSet::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { _SetHwnd( hwndDlg ); - m_hwndCharSet = ::GetDlgItem( GetHwnd(), IDC_COMBO_CHARSET ); // •¶ŽšƒR[ƒhƒZƒbƒgƒRƒ“ƒ{ƒ{ƒbƒNƒX - m_hwndCheckBOM = ::GetDlgItem( GetHwnd(), IDC_CHECK_BOM ); // BOMƒ`ƒFƒbƒNƒ{ƒbƒNƒX + m_hwndCharSet = ::GetDlgItem( GetHwnd(), IDC_COMBO_CHARSET ); // 文字コードセットコンボボックス + m_hwndCheckBOM = ::GetDlgItem( GetHwnd(), IDC_CHECK_BOM ); // BOMãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ - // ƒRƒ“ƒ{ƒ{ƒbƒNƒX‚̃†[ƒU[ ƒCƒ“ƒ^[ƒtƒFƒCƒX‚ðŠg’£ƒCƒ“ƒ^[ƒtƒF[ƒX‚É‚·‚é + // コンボボックスã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを拡張インターフェースã«ã™ã‚‹ Combo_SetExtendedUI( m_hwndCharSet, TRUE ); - // •¶ŽšƒR[ƒhƒZƒbƒg‘I‘ðƒRƒ“ƒ{ƒ{ƒbƒNƒX‰Šú‰» + // 文字コードセットé¸æŠžã‚³ãƒ³ãƒœãƒœãƒƒã‚¯ã‚¹åˆæœŸåŒ– int i; CCodeTypesForCombobox cCodeTypes; Combo_ResetContent( m_hwndCharSet ); @@ -71,7 +71,7 @@ BOOL CDlgSetCharSet::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) Combo_SetItemData( m_hwndCharSet, idx, cCodeTypes.GetCode(i) ); } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnInitDialog( hwndDlg, wParam, lParam ); } @@ -88,11 +88,11 @@ BOOL CDlgSetCharSet::OnBnClicked( int wID ) } return TRUE; case IDC_BUTTON_HELP: - /* u•¶ŽšƒR[ƒhƒZƒbƒgÝ’èv‚̃wƒ‹ƒv */ + /* 「文字コードセット設定ã€ã®ãƒ˜ãƒ«ãƒ— */ MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_CHG_CHARSET) ); return TRUE; case IDOK: - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ if( GetData() ){ CloseDialog( TRUE ); } @@ -102,13 +102,13 @@ BOOL CDlgSetCharSet::OnBnClicked( int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } -// BOM ‚ÌÝ’è +// BOM ã®è¨­å®š void CDlgSetCharSet::SetBOM( void ) { int nIdx; @@ -136,7 +136,7 @@ void CDlgSetCharSet::SetBOM( void ) -// •¶ŽšƒR[ƒh‘I‘ðŽž‚Ìˆ— +// 文字コードé¸æŠžæ™‚ã®å‡¦ç† BOOL CDlgSetCharSet::OnCbnSelChange( HWND hwndCtl, int wID ) { int nIdx; @@ -144,7 +144,7 @@ BOOL CDlgSetCharSet::OnCbnSelChange( HWND hwndCtl, int wID ) WPARAM fCheck; switch (wID) { - // •¶ŽšƒR[ƒh‚Ì•ÏX‚ðBOMƒ`ƒFƒbƒNƒ{ƒbƒNƒX‚É”½‰f + // 文字コードã®å¤‰æ›´ã‚’BOMãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã«å映 case IDC_COMBO_CHARSET: SetBOM(); nIdx = Combo_GetCurSel( hwndCtl ); @@ -178,10 +178,10 @@ LPVOID CDlgSetCharSet::GetHelpIdTable(void) -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgSetCharSet::SetData( void ) { - // •¶ŽšƒR[ƒhƒZƒbƒg + // 文字コードセット int nIdx, nCurIdx, nIdxOld; ECodeType nCharSet; CCodeTypesForCombobox cCodeTypes; @@ -205,17 +205,17 @@ void CDlgSetCharSet::SetData( void ) } Combo_SetCurSel( m_hwndCharSet, nCurIdx ); - // BOM‚ðÝ’è + // BOMを設定 SetBOM(); } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgSetCharSet::GetData( void ) { - // •¶ŽšƒR[ƒhƒZƒbƒg + // 文字コードセット int nIdx; nIdx = Combo_GetCurSel( m_hwndCharSet ); *m_pnCharSet = (ECodeType)Combo_GetItemData( m_hwndCharSet, nIdx ); diff --git a/sakura_core/dlg/CDlgSetCharSet.h b/sakura_core/dlg/CDlgSetCharSet.h index 2b48594f7e..67d7625db2 100644 --- a/sakura_core/dlg/CDlgSetCharSet.h +++ b/sakura_core/dlg/CDlgSetCharSet.h @@ -1,8 +1,8 @@ -/*! @file - @brief •¶ŽšƒR[ƒhƒZƒbƒgÝ’èƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief 文字コードセット設定ダイアログボックス @author Uchi - @date 2010/6/14 V‹Kì¬ + @date 2010/6/14 æ–°è¦ä½œæˆ */ /* Copyright (C) 2010, Uchi @@ -16,7 +16,7 @@ #include "dlg/CDialog.h" -//! •¶ŽšƒR[ƒhƒZƒbƒgÝ’èƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +//! 文字コードセット設定ダイアログボックス class CDlgSetCharSet : public CDialog { public: @@ -27,10 +27,10 @@ class CDlgSetCharSet : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, ECodeType*, bool* ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, ECodeType*, bool* ); /* モーダルダイアログã®è¡¨ç¤º */ - ECodeType* m_pnCharSet; // •¶ŽšƒR[ƒhƒZƒbƒg + ECodeType* m_pnCharSet; // 文字コードセット bool* m_pbBom; // BOM bool m_bCP; @@ -39,17 +39,17 @@ class CDlgSetCharSet : public CDialog protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM, LPARAM ); BOOL OnBnClicked( int ); BOOL OnCbnSelChange( HWND, int ); LPVOID GetHelpIdTable( void ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ - void SetBOM( void ); // BOM ‚ÌÝ’è + void SetBOM( void ); // BOM ã®è¨­å®š }; diff --git a/sakura_core/dlg/CDlgTagJumpList.cpp b/sakura_core/dlg/CDlgTagJumpList.cpp index 10bccd5158..bf202964cf 100644 --- a/sakura_core/dlg/CDlgTagJumpList.cpp +++ b/sakura_core/dlg/CDlgTagJumpList.cpp @@ -1,9 +1,9 @@ -/*! @file - @brief ƒ^ƒOƒWƒƒƒ“ƒvƒŠƒXƒgƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief タグジャンプリストダイアログボックス @author MIK @date 2003.4.13 - @date 2005.03.31 MIK ƒL[ƒ[ƒhŽw’èTagJump‘Ήž‚Ì‚½‚ß‘å•‚É•ÏX + @date 2005.03.31 MIK キーワード指定TagJump対応ã®ãŸã‚大幅ã«å¤‰æ›´ */ /* Copyright (C) 2003, MIK @@ -47,11 +47,11 @@ const DWORD p_helpids[] = { - IDC_LIST_TAGJUMP, HIDC_LIST_TAGJUMPLIST, //ƒtƒ@ƒCƒ‹ + IDC_LIST_TAGJUMP, HIDC_LIST_TAGJUMPLIST, //ファイル IDOK, HIDC_TAGJUMPLIST_IDOK, //OK - IDCANCEL, HIDC_TAGJUMPLIST_IDCANCEL, //ƒLƒƒƒ“ƒZƒ‹ - IDC_BUTTON_HELP, HIDC_BUTTON_TAGJUMPLIST_HELP, //ƒwƒ‹ƒv - IDC_KEYWORD, HDIC_TAGJUMPLIST_KEYWORD, //ƒL[ƒ[ƒh + IDCANCEL, HIDC_TAGJUMPLIST_IDCANCEL, //キャンセル + IDC_BUTTON_HELP, HIDC_BUTTON_TAGJUMPLIST_HELP, //ヘルプ + IDC_KEYWORD, HDIC_TAGJUMPLIST_KEYWORD, //キーワード IDC_CHECK_ICASE, HIDC_CHECK_ICASE, IDC_CHECK_ANYWHERE, HIDC_CHECK_ANYWHERE, IDC_BUTTON_NEXTTAG, HIDC_BUTTON_NEXTTAG, @@ -75,8 +75,8 @@ static const SAnchorList anchorList[] = { }; -//ƒ^ƒOƒtƒ@ƒCƒ‹‚̃tƒH[ƒ}ƒbƒg // @@ 2005.03.31 MIK ’蔉» -// @@ 2005.04.03 MIK ƒL[ƒ[ƒh‚É‹ó”’‚ªŠÜ‚Ü‚ê‚éꇂÌl—¶ +//タグファイルã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ // @@ 2005.03.31 MIK 定数化 +// @@ 2005.04.03 MIK キーワードã«ç©ºç™½ãŒå«ã¾ã‚Œã‚‹å ´åˆã®è€ƒæ…® #define TAG_FORMAT_2_A "%[^\t\r\n]\t%[^\t\r\n]\t%d;\"\t%s\t%s" #define TAG_FORMAT_1_A "%[^\t\r\n]\t%[^\t\r\n]\t%d" #define TAG_FILE_INFO_A "%[^\t\r\n]\t%[^\t\r\n]\t%[^\t\r\n]" @@ -84,13 +84,13 @@ static const SAnchorList anchorList[] = { // #define TAG_FORMAT_E_NAME_A "%[^\x7f\r\n]\x7f%[^\x7ff\r\n\x01]\x01%d,%d" // @@ 2005.03.31 MIK -//ƒL[ƒ[ƒh‚ð“ü—Í‚µ‚ÄŠY“–‚·‚éî•ñ‚ð•\Ž¦‚·‚é‚Ü‚Å‚ÌŽžŠÔ(ƒ~ƒŠ•b) +//キーワードを入力ã—ã¦è©²å½“ã™ã‚‹æƒ…報を表示ã™ã‚‹ã¾ã§ã®æ™‚é–“(ミリ秒) #define TAGJUMP_TIMER_DELAY 700 #define TAGJUMP_TIMER_DELAY_SHORT 50 /* - ctags.exe ‚ªo—Í‚·‚éAŠg’£Žq‚ƑΉž‚·‚éŽí—Þ + ctags.exe ãŒå‡ºåŠ›ã™ã‚‹ã€æ‹¡å¼µå­ã¨å¯¾å¿œã™ã‚‹ç¨®é¡ž */ static const TCHAR *p_extentions[] = { /*asm*/ _T("asm,s"), _T("d=define,l=label,m=macro,t=type"), @@ -153,10 +153,10 @@ CDlgTagJumpList::CDlgTagJumpList(bool bDirectTagJump) m_psFind0Match( NULL ), m_strOldKeyword( L"" ) { - /* ƒTƒCƒY•ÏXŽž‚Ɉʒu‚ð§Œä‚·‚éƒRƒ“ƒgƒ[ƒ‹” */ + /* サイズ変更時ã«ä½ç½®ã‚’制御ã™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«æ•° */ assert( _countof(anchorList) == _countof(m_rcItems) ); - // 2010.07.22 Moca ƒy[ƒWƒ“ƒOÌ—p‚Å Å‘å’l‚ð100¨50‚ÉŒ¸‚ç‚· + // 2010.07.22 Moca ページング採用㧠最大値を100→50ã«æ¸›ã‚‰ã™ m_pcList = new CSortedTagJumpList(50); m_psFindPrev = new STagFindState(); m_psFind0Match = new STagFindState(); @@ -181,10 +181,10 @@ CDlgTagJumpList::~CDlgTagJumpList() } /*! - ƒ^ƒCƒ}[’âŽ~ + タイマーåœæ­¢ @author MIK - @date 2005.03.31 V‹Kì¬ + @date 2005.03.31 æ–°è¦ä½œæˆ */ void CDlgTagJumpList::StopTimer( void ) { @@ -195,13 +195,13 @@ void CDlgTagJumpList::StopTimer( void ) } /*! - ƒ^ƒCƒ}[ŠJŽn + タイマー開始 - ƒL[ƒ[ƒhŽw’莞Cˆê’èŠúŠÔ•¶Žš“ü—Í‚ª‚È‚¯‚ê‚΃ŠƒXƒg‚ðXV‚·‚邽‚ß - uˆê’èŠúŠÔv‚ðŒv‚éƒ^ƒCƒ}[‚ª•K—v + キーワード指定時，一定期間文字入力ãŒãªã‘ã‚Œã°ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã™ã‚‹ãŸã‚ + 「一定期間ã€ã‚’計るタイマーãŒå¿…è¦ @author MIK - @date 2005.03.31 V‹Kì¬ + @date 2005.03.31 æ–°è¦ä½œæˆ */ void CDlgTagJumpList::StartTimer( int nDelay = TAGJUMP_TIMER_DELAY ) { @@ -210,10 +210,10 @@ void CDlgTagJumpList::StartTimer( int nDelay = TAGJUMP_TIMER_DELAY ) } /*! - ƒŠƒXƒg‚̃NƒŠƒA + リストã®ã‚¯ãƒªã‚¢ @author MIK - @date 2005.03.31 V‹Kì¬ + @date 2005.03.31 æ–°è¦ä½œæˆ */ void CDlgTagJumpList::Empty( void ) { @@ -222,9 +222,9 @@ void CDlgTagJumpList::Empty( void ) } /* - ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ + モーダルダイアログã®è¡¨ç¤º - @param[in] lParam 0=ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒv, 1=ƒL[ƒ[ƒh‚ðŽw’肵‚ă^ƒOƒWƒƒƒ“ƒv + @param[in] lParam 0=ダイレクトタグジャンプ, 1=キーワードを指定ã—ã¦ã‚¿ã‚°ã‚¸ãƒ£ãƒ³ãƒ— */ int CDlgTagJumpList::DoModal( HINSTANCE hInstance, @@ -237,7 +237,7 @@ int CDlgTagJumpList::DoModal( return ret; } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgTagJumpList::SetData( void ) { if( IsDirectTagJump() ){ @@ -251,7 +251,7 @@ void CDlgTagJumpList::SetData( void ) ::DlgItem_SetText( GetHwnd(), IDC_KEYWORD, m_pszKeyword ); } } - // From Here 2005.04.03 MIK Ý’è’l‚Ì“Ç‚Ýž‚Ý + // From Here 2005.04.03 MIK 設定値ã®èª­ã¿è¾¼ã¿ else{ HWND hwndKey; hwndKey = ::GetDlgItem( GetHwnd(), IDC_KEYWORD ); @@ -274,23 +274,23 @@ void CDlgTagJumpList::SetData( void ) } cRecentTagJump.Terminate(); } - // To Here 2005.04.03 MIK Ý’è’l‚Ì“Ç‚Ýž‚Ý + // To Here 2005.04.03 MIK 設定値ã®èª­ã¿è¾¼ã¿ SetTextDir(); UpdateData(true); - // ”O‚Ì‚½‚ßã‚©‚çUpdateData‚ÌŒã‚Ɉړ® + // 念ã®ãŸã‚上ã‹ã‚‰UpdateDataã®å¾Œã«ç§»å‹• if( ! IsDirectTagJump() ){ - StartTimer( TAGJUMP_TIMER_DELAY_SHORT ); // ʼn‚Í‹K’莞ŠÔ‘Ò‚½‚È‚¢ + StartTimer( TAGJUMP_TIMER_DELAY_SHORT ); // 最åˆã¯è¦å®šæ™‚é–“å¾…ãŸãªã„ } } -/*! @brief JumpŒó•â‚ÌXV +/*! @brief Jump候補ã®æ›´æ–° @date 2005.03.31 MIK - ƒ_ƒCƒAƒƒOOpenŽžˆÈŠO‚É‚àXV‚ª•K—v‚È‚½‚ßSetData()‚æ‚蕪—£ + ダイアログOpen時以外ã«ã‚‚æ›´æ–°ãŒå¿…è¦ãªãŸã‚SetData()より分離 */ void CDlgTagJumpList::UpdateData( bool bInit ) { @@ -341,10 +341,10 @@ void CDlgTagJumpList::UpdateData( bool bInit ) const TCHAR* pszMsgText = NULL; - // ”‚ª‘½‚·‚¬‚éꇂÍØ‚èŽÌ‚Ä‚½Ž|‚ð––”ö‚É‘}“ü + // æ•°ãŒå¤šã™ãŽã‚‹å ´åˆã¯åˆ‡ã‚Šæ¨ã¦ãŸæ—¨ã‚’末尾ã«æŒ¿å…¥ // if( m_pcList->IsOverflow() ){ - // 2010.04.03 uŽŸvu‘Ovƒ{ƒ^ƒ“’ljÁ‚µ‚Ä Overflow‚µ‚È‚­‚È‚Á‚½ -// pszMsgText = _T("(‚±‚êˆÈ~‚ÍØ‚èŽÌ‚Ä‚Ü‚µ‚½)"); + // 2010.04.03 「次ã€ã€Œå‰ã€ãƒœã‚¿ãƒ³è¿½åŠ ã—㦠Overflowã—ãªããªã£ãŸ +// pszMsgText = _T("(ã“れ以é™ã¯åˆ‡ã‚Šæ¨ã¦ã¾ã—ãŸ)"); // } if( (! bInit) && m_pcList->GetCount() == 0 ){ pszMsgText = LS(STR_DLGTAGJMP2); @@ -364,7 +364,7 @@ void CDlgTagJumpList::UpdateData( bool bInit ) } if( IsDirectTagJump() && 0 == m_nTop && ! m_bNextItem ){ - // ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒv‚ÅAƒy[ƒWƒ“ƒO‚Ì•K—v‚ª‚È‚¢‚Æ‚«‚Í”ñ•\Ž¦ + // ダイレクトタグジャンプã§ã€ãƒšãƒ¼ã‚¸ãƒ³ã‚°ã®å¿…è¦ãŒãªã„ã¨ãã¯éžè¡¨ç¤º ::ShowWindow( GetItemHwnd( IDC_BUTTON_NEXTTAG ), SW_HIDE ); ::ShowWindow( GetItemHwnd( IDC_BUTTON_PREVTAG ), SW_HIDE ); }else{ @@ -382,11 +382,11 @@ void CDlgTagJumpList::UpdateData( bool bInit ) return; } -/*! ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 +/*! ダイアログデータã®å–å¾— - @return TRUE: ³í, FALSE: “ü—̓Gƒ‰[ + @return TRUE: 正常, FALSE: 入力エラー - @date 2005.04.03 MIK Ý’è’l‚Ì•Û‘¶ˆ—’ljÁ + @date 2005.04.03 MIK 設定値ã®ä¿å­˜å‡¦ç†è¿½åŠ  */ int CDlgTagJumpList::GetData( void ) { @@ -395,12 +395,12 @@ int CDlgTagJumpList::GetData( void ) hwndList = ::GetDlgItem( GetHwnd(), IDC_LIST_TAGJUMP ); m_nIndex = ListView_GetNextItem( hwndList, -1, LVIS_SELECTED ); - // From Here 2005.04.03 MIK Ý’è’l‚Ì•Û‘¶ + // From Here 2005.04.03 MIK 設定値ã®ä¿å­˜ if( !IsDirectTagJump() ) { m_pShareData->m_sTagJump.m_bTagJumpICase = m_bTagJumpICase; m_pShareData->m_sTagJump.m_bTagJumpAnyWhere = m_bTagJumpAnyWhere; - // 2010.07.22 Œó•â‚ª‹ó‚Å‚àƒWƒƒƒ“ƒv‚ŕ‚¶‚½‚Æ‚«‚ÍAƒIƒvƒVƒ‡ƒ“‚ð•Û‘¶‚·‚é + // 2010.07.22 候補ãŒç©ºã§ã‚‚ジャンプã§é–‰ã˜ãŸã¨ãã¯ã€ã‚ªãƒ—ションをä¿å­˜ã™ã‚‹ if( m_nIndex == -1 || m_nIndex >= m_pcList->GetCapacity() ){ return FALSE; } @@ -409,7 +409,7 @@ int CDlgTagJumpList::GetData( void ) ::DlgItem_GetText( GetHwnd(), IDC_KEYWORD, tmp, _countof( tmp ) ); SetKeyword( tmp ); - //Ý’è‚ð•Û‘¶ + //設定をä¿å­˜ CRecentTagjumpKeyword cRecentTagJumpKeyword; cRecentTagJumpKeyword.AppendItem( m_pszKeyword ); cRecentTagJumpKeyword.Terminate(); @@ -422,7 +422,7 @@ int CDlgTagJumpList::GetData( void ) /*! @date 2005.03.31 MIK - ŠK‘wƒJƒ‰ƒ€‚̒ljÁDƒL[ƒ[ƒhŽw’è—“‚̒ljÁ + 階層カラムã®è¿½åŠ ï¼Žã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰æŒ‡å®šæ¬„ã®è¿½åŠ  */ BOOL CDlgTagJumpList::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { @@ -455,10 +455,10 @@ BOOL CDlgTagJumpList::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_nHeight = rcDialog.bottom - rcDialog.top; } - // ƒEƒBƒ“ƒhƒE‚̃ŠƒTƒCƒY + // ウィンドウã®ãƒªã‚µã‚¤ã‚º SetDialogPosSize(); - //ƒŠƒXƒgƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ðŽæ“¾‚·‚éB + //リストビューã®è¡¨ç¤ºä½ç½®ã‚’å–å¾—ã™ã‚‹ã€‚ hwndList = ::GetDlgItem( hwndDlg, IDC_LIST_TAGJUMP ); //ListView_DeleteAllItems( hwndList ); rc.left = rc.top = rc.right = rc.bottom = 0; @@ -508,12 +508,12 @@ BOOL CDlgTagJumpList::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) col.iSubItem = 5; ListView_InsertColumn( hwndList, 5, &col ); - /* s‘I‘ð */ + /* è¡Œé¸æŠž */ lngStyle = ListView_GetExtendedListViewStyle( hwndList ); lngStyle |= LVS_EX_FULLROWSELECT; ListView_SetExtendedListViewStyle( hwndList, lngStyle ); - // ƒ_ƒCƒŒƒNƒgƒ^ƒuƒWƒƒƒ“ƒv‚ÌŽž‚ÍAƒL[ƒ[ƒh‚ð”ñ•\Ž¦ + // ダイレクトタブジャンプã®æ™‚ã¯ã€ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã‚’éžè¡¨ç¤º HWND hwndKey = GetItemHwnd( IDC_KEYWORD ); int nShowFlag = (IsDirectTagJump() ? SW_HIDE : SW_SHOW); ::ShowWindow( GetItemHwnd( IDC_STATIC_KEYWORD ), nShowFlag ); @@ -521,10 +521,10 @@ BOOL CDlgTagJumpList::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) ::ShowWindow( GetItemHwnd( IDC_CHECK_ICASE ), nShowFlag ); ::ShowWindow( GetItemHwnd( IDC_CHECK_ANYWHERE ), nShowFlag ); if( IsDirectTagJump() ){ - //ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒv + //ダイレクトタグジャンプ bRet = TRUE; }else{ - //ƒL[ƒ[ƒhŽw’è + //キーワード指定 ::SetFocus( hwndKey ); bRet = FALSE; //for set focus } @@ -533,7 +533,7 @@ BOOL CDlgTagJumpList::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) m_comboDel.pRecent = &m_cRecentKeyword; SetComboBoxDeleter(hwndKey, &m_comboDel); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ CDialog::OnInitDialog( GetHwnd(), wParam, lParam ); return bRet; @@ -544,13 +544,13 @@ BOOL CDlgTagJumpList::OnBnClicked( int wID ) switch( wID ) { case IDC_BUTTON_HELP: - /* ƒwƒ‹ƒv */ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID( F_TAGJUMP_LIST ) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* ヘルプ */ + MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID( F_TAGJUMP_LIST ) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDOK: /* ¶‰E‚É•\Ž¦ */ + case IDOK: /* å·¦å³ã«è¡¨ç¤º */ StopTimer(); - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), (BOOL)GetData() ); return TRUE; @@ -559,7 +559,7 @@ BOOL CDlgTagJumpList::OnBnClicked( int wID ) ::EndDialog( GetHwnd(), FALSE ); return TRUE; - // From Here 2005.04.03 MIK ŒŸõðŒÝ’è + // From Here 2005.04.03 MIK 検索æ¡ä»¶è¨­å®š case IDC_CHECK_ICASE: m_bTagJumpICase = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_ICASE ) == BST_CHECKED; StartTimer( TAGJUMP_TIMER_DELAY_SHORT ); @@ -569,7 +569,7 @@ BOOL CDlgTagJumpList::OnBnClicked( int wID ) m_bTagJumpAnyWhere = ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_ANYWHERE ) == BST_CHECKED; StartTimer( TAGJUMP_TIMER_DELAY_SHORT ); return TRUE; - // To Here 2005.04.03 MIK ŒŸõðŒÝ’è + // To Here 2005.04.03 MIK 検索æ¡ä»¶è¨­å®š case IDC_BUTTON_NEXTTAG: m_nTop += m_pcList->GetCapacity(); @@ -583,7 +583,7 @@ BOOL CDlgTagJumpList::OnBnClicked( int wID ) return TRUE; } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } @@ -604,7 +604,7 @@ INT_PTR CDlgTagJumpList::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPA BOOL CDlgTagJumpList::OnSize( WPARAM wParam, LPARAM lParam ) { - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ CDialog::OnSize( wParam, lParam ); ::GetWindowRect( GetHwnd(), &GetDllShareData().m_Common.m_sOthers.m_rcTagJumpDialog ); @@ -657,7 +657,7 @@ BOOL CDlgTagJumpList::OnNotify( WPARAM wParam, LPARAM lParam ) hwndList = GetDlgItem( GetHwnd(), IDC_LIST_TAGJUMP ); - // Œó•âˆê——ƒŠƒXƒgƒ{ƒbƒNƒX + // 候補一覧リストボックス if( hwndList == pNMHDR->hwndFrom ) { switch( pNMHDR->code ) @@ -669,14 +669,14 @@ BOOL CDlgTagJumpList::OnNotify( WPARAM wParam, LPARAM lParam ) } } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnNotify( wParam, lParam ); } /*! - ƒ^ƒCƒ}[Œo‰ß + ã‚¿ã‚¤ãƒžãƒ¼çµŒéŽ - ƒ^ƒCƒ}[‚ð’âŽ~‚µCŒó•âƒŠƒXƒg‚ðXV‚·‚é + タイマーをåœæ­¢ã—，候補リストを更新ã™ã‚‹ */ BOOL CDlgTagJumpList::OnTimer( WPARAM wParam ) { @@ -688,15 +688,15 @@ BOOL CDlgTagJumpList::OnTimer( WPARAM wParam ) } /*! - ƒ^ƒCƒ}[Œo‰ß + ã‚¿ã‚¤ãƒžãƒ¼çµŒéŽ - ƒ^ƒCƒ}[‚ðŠJŽn‚µCŒó•âƒŠƒXƒg‚ðXV‚·‚途õ‚ð‚·‚é + タイマーを開始ã—，候補リストを更新ã™ã‚‹æº–備をã™ã‚‹ */ BOOL CDlgTagJumpList::OnCbnEditChange( HWND hwndCtl, int wID ) { StartTimer(); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnCbnEditChange( hwndCtl, wID ); } @@ -704,7 +704,7 @@ BOOL CDlgTagJumpList::OnCbnSelChange( HWND hwndCtl, int wID ) { StartTimer(); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnCbnSelChange( hwndCtl, wID ); } @@ -713,7 +713,7 @@ BOOL CDlgTagJumpList::OnEnChange( HWND hwndCtl, int wID ) { StartTimer(); - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnEnChange( hwndCtl, wID ); } #endif @@ -726,7 +726,7 @@ LPVOID CDlgTagJumpList::GetHelpIdTable( void ) #if 0 bool CDlgTagJumpList::AddParamA( const ACHAR *s0, const ACHAR *s1, int n2, const ACHAR *s3, const ACHAR *s4, int depth, int fileBase ) { - if( -1 == m_nIndex ) m_nIndex = 0; //‹K’è’l + if( -1 == m_nIndex ) m_nIndex = 0; //è¦å®šå€¤ ClearPrevFindInfo(); m_bNextItem = false; @@ -747,8 +747,8 @@ bool CDlgTagJumpList::GetSelectedFullPathAndLine( TCHAR *fullPath, int count, in } /* - @param lineNum [out] ƒIƒvƒVƒ‡ƒ“ - @param depth [out] ƒIƒvƒVƒ‡ƒ“ + @param lineNum [out] オプション + @param depth [out] オプション */ bool CDlgTagJumpList::GetFullPathAndLine( int index, TCHAR *fullPath, int count, int *lineNum, int *depth ) { @@ -764,7 +764,7 @@ bool CDlgTagJumpList::GetFullPathAndLine( int index, TCHAR *fullPath, int count, *depth = tempDepth; } const TCHAR* fileNamePath; - // ƒtƒ@ƒCƒ‹–¼AƒfƒBƒŒƒNƒgƒŠŽw’èAŠî€ƒtƒ@ƒCƒ‹ƒpƒXA‚̇‚É“K—pB“r’†‚Ńtƒ‹ƒpƒX‚È‚ç‚»‚Ì‚Ü‚ÜB + // ファイルåã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŒ‡å®šã€åŸºæº–ファイルパスã€ã®é †ã«é©ç”¨ã€‚途中ã§ãƒ•ãƒ«ãƒ‘スãªã‚‰ãã®ã¾ã¾ã€‚ if( dirFileName[0] ){ AddLastYenFromDirectoryPath( dirFileName ); const TCHAR *p = fileName; @@ -777,7 +777,7 @@ bool CDlgTagJumpList::GetFullPathAndLine( int index, TCHAR *fullPath, int count, }else if( _istalpha( p[0] ) && p[1] == _T(':') ){ auto_strcpy( dirFileName, p ); }else{ - // ‘Š‘΃pƒXF˜AŒ‹‚·‚é + // 相対パス：連çµã™ã‚‹ auto_strcat( dirFileName, p ); } fileNamePath = dirFileName; @@ -794,7 +794,7 @@ bool CDlgTagJumpList::GetFullPathAndLine( int index, TCHAR *fullPath, int count, } /*! - @return u.extvŒ`Ž®‚̃^ƒCƒvî•ñB free‚·‚邱‚Æ + @return 「.extã€å½¢å¼ã®ã‚¿ã‚¤ãƒ—情報。 freeã™ã‚‹ã“㨠*/ TCHAR *CDlgTagJumpList::GetNameByType( const TCHAR type, const TCHAR *name ) { @@ -805,7 +805,7 @@ TCHAR *CDlgTagJumpList::GetNameByType( const TCHAR type, const TCHAR *name ) TCHAR tmp[MAX_TAG_STRING_LENGTH]; p = _tcsrchr( name, _T('.') ); - if( ! p ) p = _T(".c"); //Œ©‚‚©‚ç‚È‚¢‚Æ‚«‚Í ".c" ‚Æ‘z’è‚·‚éB + if( ! p ) p = _T(".c"); //見ã¤ã‹ã‚‰ãªã„ã¨ã㯠".c" ã¨æƒ³å®šã™ã‚‹ã€‚ p++; for( i = 0; p_extentions[i]; i += 2 ) @@ -839,7 +839,7 @@ TCHAR *CDlgTagJumpList::GetNameByType( const TCHAR type, const TCHAR *name ) } /*! - Šî€ƒtƒ@ƒCƒ‹–¼‚ðÝ’è + 基準ファイルåを設定 */ void CDlgTagJumpList::SetFileName( const TCHAR *pszFileName ) { @@ -854,7 +854,7 @@ void CDlgTagJumpList::SetFileName( const TCHAR *pszFileName ) } /*! - ŒŸõƒL[ƒ[ƒh‚ÌÝ’è + 検索キーワードã®è¨­å®š */ void CDlgTagJumpList::SetKeyword( const wchar_t *pszKeyword ) @@ -889,16 +889,16 @@ typedef struct tagTagPathInfo { } TagPathInfo; /*! - “¾‚ç‚ꂽŒó•â‚©‚çÅ‚àŠú‘Ò‚É‹ß‚¢‚ÆŽv‚í‚ê‚é‚à‚Ì‚ð - ‘I‚Ño‚·D(‰Šú‘I‘ðˆÊ’uŒˆ’è‚Ì‚½‚ß) + 得られãŸå€™è£œã‹ã‚‰æœ€ã‚‚期待ã«è¿‘ã„ã¨æ€ã‚れるもã®ã‚’ + é¸ã³å‡ºã™ï¼Ž(åˆæœŸé¸æŠžä½ç½®æ±ºå®šã®ãŸã‚) - @return ‘I‘ð‚³‚ê‚½ƒAƒCƒeƒ€‚Ìindex + @return é¸æŠžã•ã‚ŒãŸã‚¢ã‚¤ãƒ†ãƒ ã®index - @date 2014.06.14 ƒtƒ@ƒCƒ‹–¼EŠg’£ŽqˆÈŠO‚Ƀhƒ‰ƒCƒuEƒpƒX‚àl—¶‚·‚é‚悤‚É + @date 2014.06.14 ファイルå・拡張å­ä»¥å¤–ã«ãƒ‰ãƒ©ã‚¤ãƒ–・パスも考慮ã™ã‚‹ã‚ˆã†ã« */ int CDlgTagJumpList::SearchBestTag( void ) { - if( m_pcList->GetCount() <= 0 ) return -1; //‘I‚ׂ܂¹‚ñB + if( m_pcList->GetCount() <= 0 ) return -1; //é¸ã¹ã¾ã›ã‚“。 if( NULL == m_pszFileName ) return 0; std::auto_ptr mem_lpPathInfo( new TagPathInfo ); @@ -927,7 +927,7 @@ int CDlgTagJumpList::SearchBestTag( void ) for( i = 0; i < count; i++ ) { - // ƒ^ƒO‚̃tƒ@ƒCƒ‹–¼•”•ª‚ðƒtƒ‹ƒpƒX‚É‚·‚é + // ã‚¿ã‚°ã®ãƒ•ã‚¡ã‚¤ãƒ«å部分をフルパスã«ã™ã‚‹ lpPathInfo->szFileNameDst[0] = _T('\0'); { TCHAR szPath[_MAX_PATH]; @@ -948,21 +948,21 @@ int CDlgTagJumpList::SearchBestTag( void ) lpPathInfo->nExtDst = _tcslen(lpPathInfo->szExtDst); if(_tcsicmp(m_pszFileName, lpPathInfo->szFileNameDst) == 0){ - return i; //“¯ˆêƒtƒ@ƒCƒ‹‚ðŒ©‚Â‚¯‚½ + return i; //åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’見ã¤ã‘㟠} if((nMatch1 == -1) && (_tcsicmp(lpPathInfo->szDriveSrc, lpPathInfo->szDriveDst) == 0) && (_tcsicmp(lpPathInfo->szPathSrc, lpPathInfo->szPathDst) == 0) && (_tcsicmp(lpPathInfo->szFileSrc, lpPathInfo->szFileDst) == 0)){ - //ƒtƒ@ƒCƒ‹–¼‚܂ňê’v + //ファイルåã¾ã§ä¸€è‡´ nMatch1 = i; } if((nMatch2 == -1) && (_tcsicmp(lpPathInfo->szDriveSrc, lpPathInfo->szDriveDst) == 0) && (_tcsicmp(lpPathInfo->szPathSrc, lpPathInfo->szPathDst) == 0)){ - //ƒpƒX–¼‚܂ňê’v + //パスåã¾ã§ä¸€è‡´ nMatch2 = i; } @@ -993,13 +993,13 @@ int CDlgTagJumpList::SearchBestTag( void ) if((nMatch3 == -1) && (_tcsicmp(lpPathInfo->szFileSrc, lpPathInfo->szFileDst) == 0) && (_tcsicmp(lpPathInfo->szExtSrc, lpPathInfo->szExtDst) == 0)){ - //ƒtƒ@ƒCƒ‹–¼EŠg’£Žq‚ªˆê’v + //ファイルå・拡張å­ãŒä¸€è‡´ nMatch3 = i; } if((nMatch4 == -1) && (_tcsicmp(lpPathInfo->szFileSrc, lpPathInfo->szFileDst) == 0)){ - //ƒtƒ@ƒCƒ‹–¼‚ªˆê’v + //ファイルåãŒä¸€è‡´ nMatch4 = i; } } @@ -1016,7 +1016,7 @@ int CDlgTagJumpList::SearchBestTag( void ) } /*! - @param bNewFind V‚µ‚¢ŒŸõðŒ(ŽŸE‘O‚Ì‚Æ‚«false) + @param bNewFind æ–°ã—ã„検索æ¡ä»¶(次・å‰ã®ã¨ãfalse) */ void CDlgTagJumpList::FindNext( bool bNewFind ) { @@ -1024,13 +1024,13 @@ void CDlgTagJumpList::FindNext( bool bNewFind ) szKey[0] = L'\0'; ::DlgItem_GetText( GetHwnd(), IDC_KEYWORD, szKey, _countof( szKey ) ); if( bNewFind ){ - // ‘O‰ñ‚̃L[ƒ[ƒh‚©‚ç‚ÌižŒŸõ‚Ì‚Æ‚«‚ÅAtags‚ðƒXƒLƒbƒv‚Å‚«‚é‚Æ‚«‚̓XƒLƒbƒv + // å‰å›žã®ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã‹ã‚‰ã®çµžè¾¼æ¤œç´¢ã®ã¨ãã§ã€tagsをスキップã§ãã‚‹ã¨ãã¯ã‚¹ã‚­ãƒƒãƒ— if( -1 < m_psFind0Match->m_nDepth && (m_bTagJumpAnyWhere == m_bOldTagJumpAnyWhere || FALSE == m_bTagJumpAnyWhere) && (m_bTagJumpICase == m_bOldTagJumpICase || FALSE == m_bTagJumpICase) && 0 == wcsncmp( m_strOldKeyword.GetStringPtr(), szKey, m_strOldKeyword.GetStringLength() ) ){ - // Œ³‚̃L[ƒ[ƒh‚Å‚PŒ‚àƒqƒbƒg‚µ‚È‚¢tags‚ª‚ ‚é‚Ì‚Å”ò‚΂· - // ðŒ‚Í“¯‚¶‚©AŒµ‚µ‚­‚È‚é‚È‚ç–â‘è‚È‚¢ + // å…ƒã®ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã§ï¼‘件もヒットã—ãªã„tagsãŒã‚ã‚‹ã®ã§é£›ã°ã™ + // æ¡ä»¶ã¯åŒã˜ã‹ã€åŽ³ã—ããªã‚‹ãªã‚‰å•é¡Œãªã„ }else{ ClearPrevFindInfo(); } @@ -1041,17 +1041,17 @@ void CDlgTagJumpList::FindNext( bool bNewFind ) } /*! - ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒvŒŸõ(DoModal‘O‚ÉŽÀs) + ダイレクトタグジャンプ検索(DoModalå‰ã«å®Ÿè¡Œ) */ int CDlgTagJumpList::FindDirectTagJump() { return find_key_core( - 0, // 0ŠJŽn + 0, // 0開始 m_pszKeyword, - false, // •”•ªˆê’v - true, // Š®‘Sˆê’v - false, // ‘嬂ð‹æ•Ê - true, // Ž©“®ƒ‚[ƒh + false, // 部分一致 + true, // 完全一致 + false, // 大å°ã‚’区別 + true, // 自動モード m_pShareData->m_Common.m_sSearch.m_nTagJumpMode ); } @@ -1075,25 +1075,25 @@ void CDlgTagJumpList::find_key( const wchar_t* keyword ) } /*! - ƒ^ƒOƒtƒ@ƒCƒ‹‚©‚çƒL[ƒ[ƒh‚Ƀ}ƒbƒ`‚·‚éƒf[ƒ^‚ð’Šo‚µCm_cList‚ÉÝ’è‚·‚é + タグファイルã‹ã‚‰ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã«ãƒžãƒƒãƒã™ã‚‹ãƒ‡ãƒ¼ã‚¿ã‚’抽出ã—，m_cListã«è¨­å®šã™ã‚‹ - @date 2007.03.13 genta ƒoƒbƒtƒ@ƒI[ƒo[ƒ‰ƒ“Žb’è‘Έ‚Ńoƒbƒtƒ@ƒTƒCƒY•ÏX - @date 2010.04.02 Moca ‚¢‚ë‚¢‚ë•ÏXBSJIS‚Å“Ç‚ÞBƒy[ƒWƒ“ƒO, format=1‚̉ðŽßAƒ^ƒOƒtƒ@ƒCƒ‹î•ñ‚Ì—˜—p - u‘Stags‚ÌŒŸõŒ‹‰Ê‚ðƒ\[ƒg‚µ‚Ä擪‚©‚çCapaticy‚Ü‚Åv‚ðutagsƒtƒ@ƒCƒ‹‡(=depth)‡AƒL[ƒ[ƒh‡v‚É•ÏX - @date 2010.07.21 find_key¨find_key_core‚É‚µ‚ÄACViewCommander::Command_TagJumpByTagsFile‚Æ“‡ + @date 2007.03.13 genta ãƒãƒƒãƒ•ã‚¡ã‚ªãƒ¼ãƒãƒ¼ãƒ©ãƒ³æš«å®šå¯¾å‡¦ã§ãƒãƒƒãƒ•ã‚¡ã‚µã‚¤ã‚ºå¤‰æ›´ + @date 2010.04.02 Moca ã„ã‚ã„ã‚変更。SJISã§èª­ã‚€ã€‚ページング, format=1ã®è§£é‡ˆã€ã‚¿ã‚°ãƒ•ã‚¡ã‚¤ãƒ«æƒ…å ±ã®åˆ©ç”¨ + 「全tagsã®æ¤œç´¢çµæžœã‚’ソートã—ã¦å…ˆé ­ã‹ã‚‰Capaticyã¾ã§ã€ã‚’「tagsファイル順(=depth)é †ã€ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰é †ã€ã«å¤‰æ›´ + @date 2010.07.21 find_key→find_key_coreã«ã—ã¦ã€CViewCommander::Command_TagJumpByTagsFileã¨çµ±åˆ */ int CDlgTagJumpList::find_key_core( int nTop, const wchar_t* keyword, - bool bTagJumpAnyWhere, // •”•ªˆê’v - bool bTagJumpExactMatch, // Š®‘Sˆê’v + bool bTagJumpAnyWhere, // 部分一致 + bool bTagJumpExactMatch, // 完全一致 bool bTagJumpICase, - bool bTagJumpICaseByTags, // Tagƒtƒ@ƒCƒ‹‘¤‚̃\[ƒg‚É]‚¤ + bool bTagJumpICaseByTags, // Tagファイルå´ã®ã‚½ãƒ¼ãƒˆã«å¾“ㆠint nDefaultNextMode ){ assert_warning( !(bTagJumpAnyWhere && bTagJumpExactMatch) ); - // to_achar‚͈ꎞƒoƒbƒtƒ@‚Å”j‰ó‚³‚ê‚é‰Â”\«‚ª‚ ‚é‚̂ŃRƒs[ + // to_acharã¯ä¸€æ™‚ãƒãƒƒãƒ•ã‚¡ã§ç ´å£Šã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚‹ã®ã§ã‚³ãƒ”ー CNativeA cmemKeyA = CNativeA(to_achar(keyword)); const ACHAR* paszKeyword = cmemKeyA.GetStringPtr(); int length = cmemKeyA.GetStringLength(); @@ -1109,7 +1109,7 @@ int CDlgTagJumpList::find_key_core( ClearPrevFindInfo(); return -1; } - // ‰•œ•ÏŠ·‚µ‚Ă݂Ĉê’v‚µ‚È‚©‚Á‚½‚çAŒŸõƒL[‚ɂ͈ê’v‚µ‚È‚¢‚Æ‚¢‚¤‚±‚Æ‚É‚·‚é + // 往復変æ›ã—ã¦ã¿ã¦ä¸€è‡´ã—ãªã‹ã£ãŸã‚‰ã€æ¤œç´¢ã‚­ãƒ¼ã«ã¯ä¸€è‡´ã—ãªã„ã¨ã„ã†ã“ã¨ã«ã™ã‚‹ if( 0 != wcscmp( to_wchar( paszKeyword ), keyword ) ){ ClearPrevFindInfo(); return -1; @@ -1121,42 +1121,42 @@ int CDlgTagJumpList::find_key_core( state.m_nMatchAll = 0; state.m_nNextMode = nDefaultNextMode; state.m_nLoop = -1; - state.m_bJumpPath = false; // eˆÈŠO‚̃pƒX‚̈ړ®æŽw’è + state.m_bJumpPath = false; // 親以外ã®ãƒ‘スã®ç§»å‹•å…ˆæŒ‡å®š state.m_szCurPath[0] = 0; - // ‘O‰ñ‚ÌŒ‹‰Ê‚©‚猟õ‘ÎÛtags‚ði‚é + // å‰å›žã®çµæžœã‹ã‚‰æ¤œç´¢å¯¾è±¡tagsを絞る if( m_psFindPrev->m_nMatchAll <= nTop && -1 < m_psFindPrev->m_nMatchAll ){ - // Žw’èƒy[ƒW‚ÌŒŸõ‚ðƒXƒLƒbƒv + // 指定ページã®æ¤œç´¢ã‚’スキップ state = *m_psFindPrev; DEBUG_TRACE( _T("skip count d:%d m:%d n:%d\n"), state.m_nDepth, state.m_nMatchAll, state.m_nNextMode ); }else if( 0 <= m_psFind0Match->m_nDepth ){ - // depth‚ªó‚¢‡‚Ƀqƒbƒg‚µ‚È‚©‚Á‚½•ª‚ðƒXƒLƒbƒv + // depthãŒæµ…ã„é †ã«ãƒ’ットã—ãªã‹ã£ãŸåˆ†ã‚’スキップ state = *m_psFind0Match; DEBUG_TRACE( _T("skip 0match d:%d m:%d n:%d\n"), state.m_nDepth, state.m_nMatchAll, state.m_nNextMode ); }else{ - // ‰‰ñorŽg‚¦‚È‚¢‚Æ‚«‚̓NƒŠƒA + // åˆå›žor使ãˆãªã„ã¨ãã¯ã‚¯ãƒªã‚¢ ClearPrevFindInfo(); - // ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[‚µ‚½‚ ‚ÆAƒfƒBƒŒƒNƒgƒŠ(ÅŒã\)‚Ì‚Ý‚É‚·‚é + // ファイルåをコピーã—ãŸã‚ã¨ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª(最後\)ã®ã¿ã«ã™ã‚‹ _tcscpy( state.m_szCurPath, GetFilePath() ); state.m_szCurPath[ GetFileName() - GetFilePath() ] = _T('\0'); state.m_nLoop = m_nLoop; } - TCHAR szTagFile[1024]; //ƒ^ƒOƒtƒ@ƒCƒ‹ - TCHAR szNextPath[1024]; //ŽŸŒŸõƒtƒHƒ‹ƒ_ - ACHAR szLineData[1024]; //sƒoƒbƒtƒ@ + TCHAR szTagFile[1024]; //タグファイル + TCHAR szNextPath[1024]; //次検索フォルダ + ACHAR szLineData[1024]; //è¡Œãƒãƒƒãƒ•ã‚¡ ACHAR s[4][1024]; int n2; szNextPath[0] = _T('\0'); vector_ex seachDirs; - // ƒpƒX‚ÌJump‚ÅzŠÂ‚µ‚Ä‚¢‚éꇂÉÅ‘å’l‚ð‹K§‚·‚é + // パスã®Jumpã§å¾ªç’°ã—ã¦ã„ã‚‹å ´åˆã«æœ€å¤§å€¤ã‚’è¦åˆ¶ã™ã‚‹ for( ; state.m_nDepth <= state.m_nLoop && state.m_nDepth < (_MAX_PATH/2); state.m_nDepth++ ) { - // 0 ŽŸ‚̃tƒ@ƒCƒ‹‚ÍŒŸõ‚µ‚È‚¢ - // 1 1‚‚łàƒqƒbƒg‚µ‚½‚玟‚ÍŒŸõ‚µ‚È‚¢ - // 2 Š®‘Sˆê’v‚Ì‚Æ‚«‚Í1‚É“¯‚¶B ‚»‚êˆÈŠO‚Í3‚É“¯‚¶ - // 3 •K‚¸ŽŸ‚àŒŸõ + // 0 次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ¤œç´¢ã—ãªã„ + // 1 1ã¤ã§ã‚‚ヒットã—ãŸã‚‰æ¬¡ã¯æ¤œç´¢ã—ãªã„ + // 2 完全一致ã®ã¨ãã¯1ã«åŒã˜ã€‚ ãれ以外ã¯3ã«åŒã˜ + // 3 å¿…ãšæ¬¡ã‚‚検索 if( 0 == state.m_nNextMode ) break; if( 1 == state.m_nNextMode && 0 < state.m_nMatchAll ) break; if( 2 == state.m_nNextMode && bTagJumpExactMatch && 0 < state.m_nMatchAll ) break; @@ -1164,24 +1164,24 @@ int CDlgTagJumpList::find_key_core( { std::tstring curPath = state.m_szCurPath; if( seachDirs.exist( curPath ) ){ - // ŒŸõÏ‚Ý =>I—¹ + // 検索済㿠=>終了 break; } seachDirs.push_back( curPath ); } - //ƒ^ƒOƒtƒ@ƒCƒ‹–¼‚ð쬂·‚éB + //タグファイルåを作æˆã™ã‚‹ã€‚ auto_sprintf( szTagFile, _T("%ts%ts"), state.m_szCurPath, TAG_FILENAME_T ); DEBUG_TRACE( _T("tag: %ts\n"), szTagFile ); - //ƒ^ƒOƒtƒ@ƒCƒ‹‚ðŠJ‚­B + //タグファイルを開ã。 FILE* fp = _tfopen( szTagFile, _T("rb") ); if( fp ) { DEBUG_TRACE( _T("open tags\n") ); bool bSorted = true; bool bFoldcase = false; - int nTagFormat = 2; // 2‚Í1‚à“Ç‚ß‚é‚̂ŃfƒtƒHƒ‹ƒg‚Í2 + int nTagFormat = 2; // 2ã¯1も読ã‚ã‚‹ã®ã§ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯2 int nLines = 0; int baseDirId = 0; if( state.m_bJumpPath ){ @@ -1189,24 +1189,24 @@ int CDlgTagJumpList::find_key_core( } state.m_nNextMode = nDefaultNextMode; - // ƒoƒbƒtƒ@‚ÌŒã‚ë‚©‚ç2•¶Žš–Ú‚ª\0‚©‚Ç‚¤‚©‚ÅAs––‚Ü‚Å“Ç‚Ýž‚ñ‚¾‚©Šm”F‚·‚é + // ãƒãƒƒãƒ•ã‚¡ã®å¾Œã‚ã‹ã‚‰2文字目ãŒ\0ã‹ã©ã†ã‹ã§ã€è¡Œæœ«ã¾ã§èª­ã¿è¾¼ã‚“ã ã‹ç¢ºèªã™ã‚‹ const int nLINEDATA_LAST_CHAR = _countof( szLineData ) - 2; szLineData[nLINEDATA_LAST_CHAR] = '\0'; while( fgets( szLineData, _countof( szLineData ), fp ) ) { nLines++; int nRet; - // fgets‚ªs‚·‚ׂĂð“Ç‚Ýž‚ß‚Ä‚¢‚È‚¢ê‡‚Ìl—¶ + // fgetsãŒè¡Œã™ã¹ã¦ã‚’読ã¿è¾¼ã‚ã¦ã„ãªã„å ´åˆã®è€ƒæ…® if( '\0' != szLineData[nLINEDATA_LAST_CHAR] && '\n' != szLineData[nLINEDATA_LAST_CHAR] ){ - // ‰üsƒR[ƒh‚Ü‚Å‚ðŽÌ‚Ä‚é + // 改行コードã¾ã§ã‚’æ¨ã¦ã‚‹ int ch = fgetc( fp ); while( ch != '\n' && ch != EOF ){ ch = fgetc( fp ); } } if( 1 == nLines && szLineData[0] == '\x0c' ){ - // etags‚È‚Ì‚ÅŽŸ‚̃tƒ@ƒCƒ‹ + // etagsãªã®ã§æ¬¡ã®ãƒ•ã‚¡ã‚¤ãƒ« break; } if( '!' == szLineData[0] ){ @@ -1214,7 +1214,7 @@ int CDlgTagJumpList::find_key_core( s[0][0] = s[1][0] = s[2][0] = 0; nRet = sscanf( szLineData, - TAG_FILE_INFO_A, //tagsƒtƒ@ƒCƒ‹î•ñ + TAG_FILE_INFO_A, //tagsファイル情報 s[0], s[1], s[2] ); if( nRet < 2 ) goto next_line; @@ -1232,28 +1232,28 @@ int CDlgTagJumpList::find_key_core( bTagJumpICase = bFoldcase; } }else if( 0 == strncmp_literal( pTag, "S_SEARCH_NEXT" ) ){ - // “ÆŽ©Šg’£:ŽŸ‚ÉŒŸõ‚·‚étagƒtƒ@ƒCƒ‹‚ÌŽw’è + // 独自拡張:次ã«æ¤œç´¢ã™ã‚‹tagファイルã®æŒ‡å®š if( '0' <= s[1][0] && s[1][0] <= '3' ){ n2 = atoi( s[1] ); if( 0 <= n2 && n2 <= 3 ){ state.m_nNextMode = n2; } if( 1 <= n2 && s[2][0] ){ - // s[2] == â‘΃pƒX(ƒfƒBƒŒƒNƒgƒŠ) + // s[2] == 絶対パス(ディレクトリ) TCHAR baseWork[1024]; CopyDirDir( baseWork, to_tchar(s[2]), state.m_szCurPath ); szNextPath[0] = 0; if( !GetLongFileName( baseWork, szNextPath ) ){ - // ƒGƒ‰[‚È‚ç•ÏŠ·‘O‚ð“K—p + // エラーãªã‚‰å¤‰æ›å‰ã‚’é©ç”¨ auto_strcpy( szNextPath, baseWork ); } } } }else if( 0 == strncmp_literal( pTag, "S_FILE_BASEDIR" ) ){ TCHAR baseWork[1024]; - // “ÆŽ©Šg’£:ƒtƒ@ƒCƒ‹–¼‚̊fƒBƒŒƒNƒgƒŠ + // 独自拡張:ファイルåã®åŸºæº–ディレクトリ if( state.m_bJumpPath ){ - // ƒpƒXe“Ç‚Ý‘Ö‚¦’†‚ÍA‘Š‘΃pƒX‚¾‚Á‚½ê‡‚ɘAŒ‹‚ª•K—v + // パス親読ã¿æ›¿ãˆä¸­ã¯ã€ç›¸å¯¾ãƒ‘スã ã£ãŸå ´åˆã«é€£çµãŒå¿…è¦ CopyDirDir( baseWork, to_tchar(s[1]), state.m_szCurPath ); baseDirId = cList.AddBaseDir( baseWork ); }else{ @@ -1263,27 +1263,27 @@ int CDlgTagJumpList::find_key_core( } } } - goto next_line; //ƒRƒƒ“ƒg‚È‚çƒXƒLƒbƒv + goto next_line; //コメントãªã‚‰ã‚¹ã‚­ãƒƒãƒ— } if( szLineData[0] < '!' ) goto next_line; //chop( szLineData ); s[0][0] = s[1][0] = s[2][0] = s[3][0] = '\0'; n2 = 0; - // @@ 2005.03.31 MIK TAG_FORMAT’蔉» + // @@ 2005.03.31 MIK TAG_FORMAT定数化 if( 2 == nTagFormat ){ nRet = sscanf( szLineData, - TAG_FORMAT_2_A, //Šg’£tagsƒtƒH[ƒ}ƒbƒg + TAG_FORMAT_2_A, //æ‹¡å¼µtagsフォーマット s[0], s[1], &n2, s[2], s[3] ); - // 2010.04.02 nRet < 4 ‚ð3‚É•ÏXB•W€ƒtƒH[ƒ}ƒbƒg‚à“Ç‚Ýž‚Þ + // 2010.04.02 nRet < 4 ã‚’3ã«å¤‰æ›´ã€‚標準フォーマットも読ã¿è¾¼ã‚€ if( nRet < 3 ) goto next_line; - if( n2 <= 0 ) goto next_line; //s”Ô†•s³(-excmd=n‚ªŽw’肳‚ê‚Ä‚È‚¢‚©‚à) + if( n2 <= 0 ) goto next_line; //行番å·ä¸æ­£(-excmd=nãŒæŒ‡å®šã•ã‚Œã¦ãªã„ã‹ã‚‚) }else{ nRet = sscanf( szLineData, - TAG_FORMAT_1_A, //tagsƒtƒH[ƒ}ƒbƒg + TAG_FORMAT_1_A, //tagsフォーマット s[0], s[1], &n2 ); if( nRet < 2 ) goto next_line; @@ -1299,14 +1299,14 @@ int CDlgTagJumpList::find_key_core( } }else{ if( bTagJumpExactMatch ){ - // Š®‘Sˆê’v + // 完全一致 if( bTagJumpICase ){ cmp = auto_stricmp( s[0], paszKeyword ); }else{ cmp = auto_strcmp( s[0], paszKeyword ); } }else{ - // ‘O•ûˆê’v + // å‰æ–¹ä¸€è‡´ if( bTagJumpICase ){ cmp = my_strnicmp( s[0], paszKeyword, length ); }else{ @@ -1320,18 +1320,18 @@ int CDlgTagJumpList::find_key_core( if( cList.GetCount() < nCap ){ cList.AddParamA( s[0], s[1], n2, s[2][0], s[3], state.m_nDepth, baseDirId ); }else{ - // ’Tõ‘Å‚¿Ø‚è(ŽŸƒy[ƒW‚Å‚â‚è’¼‚µ) + // 探索打ã¡åˆ‡ã‚Š(次ページã§ã‚„ã‚Šç›´ã—) m_bNextItem = true; break; } } } else if( 0 < cmp ){ - // tags‚̓\[ƒg‚³‚ê‚Ä‚¢‚é‚Ì‚ÅC擪‚©‚ç‚Ìcase sensitive‚È - // ”äŠrŒ‹‰Ê‚É‚æ‚Á‚ÄŒŸõ‚ÌŽž‚͈—‚Ì‘Å‚¿Ø‚肪‰Â”\ - // 2005.04.05 MIK ƒoƒOC³ + // tagsã¯ã‚½ãƒ¼ãƒˆã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œå…ˆé ­ã‹ã‚‰ã®case sensitive㪠+ // 比較çµæžœã«ã‚ˆã£ã¦æ¤œç´¢ã®æ™‚ã¯å‡¦ç†ã®æ‰“ã¡åˆ‡ã‚ŠãŒå¯èƒ½ + // 2005.04.05 MIK ãƒã‚°ä¿®æ­£ if( (!bTagJumpICase) && bSorted && (!bTagJumpAnyWhere) ) break; - // 2010.07.21 FoldcaseŽž‚à‘Å‚¿Ø‚éB‚½‚¾‚µtags‚ƃTƒNƒ‰‘¤‚̃\[ƒg‡‚ª“¯‚¶‚Å‚È‚¯‚ê‚΂Ȃç‚È‚¢ + // 2010.07.21 Foldcase時も打ã¡åˆ‡ã‚‹ã€‚ãŸã ã—tagsã¨ã‚µã‚¯ãƒ©å´ã®ã‚½ãƒ¼ãƒˆé †ãŒåŒã˜ã§ãªã‘ã‚Œã°ãªã‚‰ãªã„ if( bTagJumpICase && bFoldcase && (!bTagJumpAnyWhere) ) break; } next_line: @@ -1339,7 +1339,7 @@ int CDlgTagJumpList::find_key_core( szLineData[nLINEDATA_LAST_CHAR] = '\0'; } - //ƒtƒ@ƒCƒ‹‚ð•Â‚¶‚éB + //ファイルを閉ã˜ã‚‹ã€‚ fclose( fp ); DEBUG_TRACE( _T("close m:%d\n "), state.m_nMatchAll ); } @@ -1354,20 +1354,20 @@ int CDlgTagJumpList::find_key_core( szNextPath[0] = 0; }else{ // _tcscat( state.m_szCurPath, _T("..\\") ); - //ƒJƒŒƒ“ƒgƒpƒX‚ð1ŠK‘wã‚ÖB + //カレントパスを1階層上ã¸ã€‚ DirUp( state.m_szCurPath ); } if( 0 != state.m_nMatchAll && false == m_bNextItem ){ - // 0 ƒy[ƒW‚ß‚­‚è—p: ‘Å‚¿Ø‚ç‚ê‚Ä‚¢‚È‚¢‚Ì‚ÅŽŸ‚̃y[ƒW‚Å‚ÍA‚±‚Ìtags‚ÌŽŸ‚©‚猟õ‚Å‚«‚é - // (ÅŒã‚ɒʉ߂µ‚½‚à‚Ì‚ð•ÛŽ) + // 0 ページã‚ãり用: 打ã¡åˆ‡ã‚‰ã‚Œã¦ã„ãªã„ã®ã§æ¬¡ã®ãƒšãƒ¼ã‚¸ã§ã¯ã€ã“ã®tagsã®æ¬¡ã‹ã‚‰æ¤œç´¢ã§ãã‚‹ + // (最後ã«é€šéŽã—ãŸã‚‚ã®ã‚’ä¿æŒ) *m_psFindPrev = state; ++(m_psFindPrev->m_nDepth); DEBUG_TRACE( _T("FindPrev udpate: d:%d m:%d n:%d L:%d j:%d\n") , m_psFindPrev->m_nDepth, m_psFindPrev->m_nMatchAll, m_psFindPrev->m_nNextMode, m_psFindPrev->m_nLoop, (int)m_psFindPrev->m_bJumpPath ); } if( 0 == state.m_nMatchAll ){ - // ƒL[ƒ[ƒhiž‚Ý—p: ŽŸ‚Ìi‚èž‚ÝŒŸõ‚Å‚ÍA‚±‚Ìtags‚ÌŽŸ‚©‚猟õ‚Å‚«‚é - // (ÅŒã‚ɒʉ߂µ‚½‚à‚Ì‚ð•ÛŽ) + // キーワード絞込ã¿ç”¨: 次ã®çµžã‚Šè¾¼ã¿æ¤œç´¢ã§ã¯ã€ã“ã®tagsã®æ¬¡ã‹ã‚‰æ¤œç´¢ã§ãã‚‹ + // (最後ã«é€šéŽã—ãŸã‚‚ã®ã‚’ä¿æŒ) *m_psFind0Match = state; ++(m_psFind0Match->m_nDepth); DEBUG_TRACE( _T("Find0Match udpate: d:%d m:%d n:%d L:%d j:%d\n") , m_psFind0Match->m_nDepth, m_psFind0Match->m_nMatchAll, m_psFind0Match->m_nNextMode, m_psFind0Match->m_nLoop, (int)m_psFind0Match->m_bJumpPath ); @@ -1380,7 +1380,7 @@ int CDlgTagJumpList::find_key_core( } /*! - ƒpƒX‚©‚çƒtƒ@ƒCƒ‹–¼•”•ª‚Ì‚Ý‚ðŽæ‚èo‚·D(2ƒoƒCƒg‘Ήž) + パスã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«å部分ã®ã¿ã‚’å–り出ã™ï¼Ž(2ãƒã‚¤ãƒˆå¯¾å¿œ) */ const TCHAR* CDlgTagJumpList::GetFileName( void ) { @@ -1404,18 +1404,18 @@ int CDlgTagJumpList::CalcMaxUpDirectory( const TCHAR* p ) { int loop = CalcDirectoryDepth( p ); if( loop < 0 ) loop = 0; - if( loop > (_MAX_PATH/2) ) loop = (_MAX_PATH/2); //\A\B\C...‚̂悤‚È‚Æ‚«1ƒtƒHƒ‹ƒ_‚Å2•¶ŽšÁ”ï‚·‚é‚Ì‚Å... + if( loop > (_MAX_PATH/2) ) loop = (_MAX_PATH/2); //\A\B\C...ã®ã‚ˆã†ãªã¨ã1フォルダã§2文字消費ã™ã‚‹ã®ã§... return loop; } /*! - @date 2010.04.02 Moca Command_TagJumpByTagsFileKeyword‚©‚番—£EˆÚ“® - @param basePath [in,out] \•tƒfƒBƒŒƒNƒgƒŠƒpƒXâ‘΃pƒX„§B‘‚«Š·‚í‚é‚Ì‚É’ˆÓ - @param fileName [in] ‘Š‘ÎEâ‘΃tƒ@ƒCƒ‹–¼ƒpƒX - @param depth [in] fineName‚ªâ‘΃pƒX‚ÌŽž–³Ž‹B1==1‚Âã‚̃fƒBƒŒƒNƒgƒŠ - @retval pszOutput ¬Œ÷ uC:\dir1\filename.txtv‚ÌŒ`Ž®(..\•t‰Á‚Í”pŽ~) - @retval NULL Ž¸”s + @date 2010.04.02 Moca Command_TagJumpByTagsFileKeywordã‹ã‚‰åˆ†é›¢ãƒ»ç§»å‹• + @param basePath [in,out] \付ディレクトリパス絶対パス推奨。書ãæ›ã‚ã‚‹ã®ã«æ³¨æ„ + @param fileName [in] 相対・絶対ファイルåパス + @param depth [in] fineNameãŒçµ¶å¯¾ãƒ‘スã®æ™‚無視。1==1ã¤ä¸Šã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª + @retval pszOutput æˆåŠŸ 「C:\dir1\filename.txtã€ã®å½¢å¼(..\付加ã¯å»ƒæ­¢) + @retval NULL 失敗 */ TCHAR* CDlgTagJumpList::GetFullPathFromDepth( TCHAR* pszOutput, int count, TCHAR* basePath, const TCHAR* fileName, int depth ) @@ -1423,17 +1423,17 @@ TCHAR* CDlgTagJumpList::GetFullPathFromDepth( TCHAR* pszOutput, int count, DEBUG_TRACE( _T("base %ts\n"), basePath ); DEBUG_TRACE( _T("file %ts\n"), fileName ); DEBUG_TRACE( _T("depth %d\n"), depth ); - //Š®‘SƒpƒX–¼‚ð쬂·‚éB + //完全パスåを作æˆã™ã‚‹ã€‚ const TCHAR *p = fileName; - if( p[0] == _T('\\') ){ //ƒhƒ‰ƒCƒu‚È‚µâ‘΃pƒX‚©H - if( p[1] == _T('\\') ){ //ƒlƒbƒgƒ[ƒNƒpƒX‚©H - _tcscpy( pszOutput, p ); //‰½‚à‰ÁH‚µ‚È‚¢B + if( p[0] == _T('\\') ){ //ドライブãªã—絶対パスã‹ï¼Ÿ + if( p[1] == _T('\\') ){ //ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ‘スã‹ï¼Ÿ + _tcscpy( pszOutput, p ); //何も加工ã—ãªã„。 }else{ - //ƒhƒ‰ƒCƒu‰ÁH‚µ‚½‚Ù‚¤‚ª‚æ‚¢H - _tcscpy( pszOutput, p ); //‰½‚à‰ÁH‚µ‚È‚¢B + //ドライブ加工ã—ãŸã»ã†ãŒã‚ˆã„？ + _tcscpy( pszOutput, p ); //何も加工ã—ãªã„。 } - }else if( _istalpha( p[0] ) && p[1] == _T(':') ){ //â‘΃pƒX‚©H - _tcscpy( pszOutput, p ); //‰½‚à‰ÁH‚µ‚È‚¢B + }else if( _istalpha( p[0] ) && p[1] == _T(':') ){ //絶対パスã‹ï¼Ÿ + _tcscpy( pszOutput, p ); //何も加工ã—ãªã„。 }else{ for( int i = 0; i < depth; i++ ){ //_tcscat( basePath, _T("..\\") ); @@ -1447,7 +1447,7 @@ TCHAR* CDlgTagJumpList::GetFullPathFromDepth( TCHAR* pszOutput, int count, } /*! - ƒfƒBƒŒƒNƒgƒŠ‚ƃfƒBƒŒƒNƒgƒŠ‚ð˜AŒ‹‚·‚é + ディレクトリã¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’連çµã™ã‚‹ */ TCHAR* CDlgTagJumpList::CopyDirDir( TCHAR* dest, const TCHAR* target, const TCHAR* base ) { @@ -1463,14 +1463,14 @@ TCHAR* CDlgTagJumpList::CopyDirDir( TCHAR* dest, const TCHAR* target, const TCHA } /* - @param dir [in,out] ƒtƒHƒ‹ƒ_‚̃pƒX + @param dir [in,out] フォルダã®ãƒ‘ス in == C:\dir\subdir\ out == C:\dir\ */ TCHAR* CDlgTagJumpList::DirUp( TCHAR* dir ) { CutLastYenFromDirectoryPath( dir ); - const TCHAR *p = GetFileTitlePointer(dir); //ÅŒã‚Ì\‚ÌŽŸ‚Ì•¶Žš‚ðŽæ“¾ last_index_of('\\') + 1; + const TCHAR *p = GetFileTitlePointer(dir); //最後ã®\ã®æ¬¡ã®æ–‡å­—ã‚’å–å¾— last_index_of('\\') + 1; if( 0 < p - dir){ dir[p - dir] = '\0'; } diff --git a/sakura_core/dlg/CDlgTagJumpList.h b/sakura_core/dlg/CDlgTagJumpList.h index bef4af9376..8eb087aee0 100644 --- a/sakura_core/dlg/CDlgTagJumpList.h +++ b/sakura_core/dlg/CDlgTagJumpList.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒ^ƒOƒWƒƒƒ“ƒvƒŠƒXƒgƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief タグジャンプリストダイアログボックス @author MIK @date 2003.4.13 @@ -36,17 +36,17 @@ #include "dlg/CDialog.h" #include "recent/CRecentTagjumpKeyword.h" -//ƒ^ƒOƒtƒ@ƒCƒ‹–¼ // @@ 2005.03.31 MIK ’蔉» +//タグファイルå // @@ 2005.03.31 MIK 定数化 #define TAG_FILENAME_T _T("tags") -// 2010.07.22 ‚¢‚­‚‚©cpp‚ÖˆÚ“® +// 2010.07.22 ã„ãã¤ã‹cppã¸ç§»å‹• class CSortedTagJumpList; -/*! @brief ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒvŒó•âˆê——ƒ_ƒCƒAƒƒO +/*! @brief ダイレクトタグジャンプ候補一覧ダイアログ - ƒ_ƒCƒŒƒNƒgƒ^ƒOƒWƒƒƒ“ƒv‚Å•¡”‚ÌŒó•â‚ª‚ ‚éꇋy‚Ñ - ƒL[ƒ[ƒhŽw’èƒ^ƒOƒWƒƒƒ“ƒv‚Ì‚½‚߂̃_ƒCƒAƒƒOƒ{ƒbƒNƒX§Œä + ダイレクトタグジャンプã§è¤‡æ•°ã®å€™è£œãŒã‚ã‚‹å ´åˆåŠã³ + キーワード指定タグジャンプã®ãŸã‚ã®ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹åˆ¶å¾¡ */ class CDlgTagJumpList : public CDialog { @@ -60,10 +60,10 @@ class CDlgTagJumpList : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM ); /* モーダルダイアログã®è¡¨ç¤º */ - // @@ 2005.03.31 MIK ŠK‘wƒpƒ‰ƒ[ƒ^‚ð’ljÁ -// bool AddParamA( const ACHAR*, const ACHAR*, int, const ACHAR*, const ACHAR*, int depth, int baseDirId ); //“o˜^ + // @@ 2005.03.31 MIK 階層パラメータを追加 +// bool AddParamA( const ACHAR*, const ACHAR*, int, const ACHAR*, const ACHAR*, int depth, int baseDirId ); //登録 void SetFileName( const TCHAR *pszFileName ); void SetKeyword( const wchar_t *pszKeyword ); // @@ 2005.03.31 MIK int FindDirectTagJump(); @@ -72,7 +72,7 @@ class CDlgTagJumpList : public CDialog protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnInitDialog( HWND, WPARAM wParam, LPARAM lParam ); BOOL OnBnClicked( int ); @@ -81,7 +81,7 @@ class CDlgTagJumpList : public CDialog BOOL OnMove( WPARAM wParam, LPARAM lParam ); BOOL OnMinMaxInfo( LPARAM lParam ); BOOL OnNotify( WPARAM wParam, LPARAM lParam ); - // @@ 2005.03.31 MIK ƒL[ƒ[ƒh“ü—̓GƒŠƒA‚̃Cƒxƒ“ƒgˆ— + // @@ 2005.03.31 MIK キーワード入力エリアã®ã‚¤ãƒ™ãƒ³ãƒˆå‡¦ç† BOOL OnCbnSelChange( HWND hwndCtl, int wID ); BOOL OnCbnEditChange( HWND hwndCtl, int wID ); //BOOL OnEnChange( HWND hwndCtl, int wID ); @@ -92,12 +92,12 @@ class CDlgTagJumpList : public CDialog void StopTimer( void ); void StartTimer( int ); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ void UpdateData( bool ); // @@ 2005.03.31 MIK - TCHAR *GetNameByType( const TCHAR type, const TCHAR *name ); //ƒ^ƒCƒv‚𖼑O‚É•ÏŠ·‚·‚éB - int SearchBestTag( void ); //‚à‚Á‚Æ‚àŠm—¦‚Ì‚‚»‚¤‚ȃCƒ“ƒfƒbƒNƒX‚ð•Ô‚·B + TCHAR *GetNameByType( const TCHAR type, const TCHAR *name ); //タイプをåå‰ã«å¤‰æ›ã™ã‚‹ã€‚ + int SearchBestTag( void ); //ã‚‚ã£ã¨ã‚‚確率ã®é«˜ãã†ãªã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’è¿”ã™ã€‚ // @@ 2005.03.31 MIK const TCHAR *GetFileName( void ); const TCHAR *GetFilePath( void ){ return m_pszFileName != NULL ? m_pszFileName : _T(""); } @@ -113,7 +113,7 @@ class CDlgTagJumpList : public CDialog bool GetFullPathAndLine( int index, TCHAR *fullPath, int count, int *lineNum, int *depth ); - //! depth‚©‚犮‘SƒpƒX–¼(‘Š‘΃pƒX/â‘΃pƒX)‚ð쬂·‚é + //! depthã‹ã‚‰å®Œå…¨ãƒ‘スå(相対パス/絶対パス)を作æˆã™ã‚‹ static TCHAR* GetFullPathFromDepth( TCHAR*, int, TCHAR*, const TCHAR*, int ); static TCHAR* CopyDirDir( TCHAR* dest, const TCHAR* target, const TCHAR* base ); public: @@ -133,26 +133,26 @@ class CDlgTagJumpList : public CDialog bool m_bDirectTagJump; - int m_nIndex; //!< ‘I‘ð‚³‚ê‚½—v‘f”Ô† - TCHAR *m_pszFileName; //!< •ÒW’†‚̃tƒ@ƒCƒ‹–¼ - wchar_t *m_pszKeyword; //!< ƒL[ƒ[ƒh(DoModal‚ÌlParam!=0‚ðŽw’肵‚½ê‡‚ÉŽw’è‚Å‚«‚é) - int m_nLoop; //!< ‚³‚©‚Ì‚Ú‚ê‚éŠK‘w” - CSortedTagJumpList* m_pcList; //!< ƒ^ƒOƒWƒƒƒ“ƒvî•ñ - UINT_PTR m_nTimerId; //!< ƒ^ƒCƒ}”Ô† - BOOL m_bTagJumpICase; //!< ‘啶Žš¬•¶Žš‚𓯈ꎋ - BOOL m_bTagJumpAnyWhere; //!< •¶Žš—ñ‚Ì“r’†‚Ƀ}ƒbƒ` - BOOL m_bTagJumpExactMatch; //!< Š®‘Sˆê’v(‰æ–Ê–³‚µ) - - int m_nTop; //!< ƒy[ƒW‚ß‚­‚è‚Ì•\Ž¦‚Ì擪(0ŠJŽn) - bool m_bNextItem; //!< ‚Ü‚¾ŽŸ‚Ƀqƒbƒg‚·‚é‚à‚Ì‚ª‚ ‚é - - // i‚èž‚ÝŒŸõ—p - STagFindState* m_psFindPrev; //!< ‘O‰ñ‚ÌÅŒã‚ÉŒŸõ‚µ‚½ó‘Ô - STagFindState* m_psFind0Match; //!< ‘O‰ñ‚Ì1‚‚àHit‚µ‚È‚©‚Á‚½ÅŒã‚Ìtags - - CNativeW m_strOldKeyword; //!< ‘O‰ñ‚̃L[ƒ[ƒh - BOOL m_bOldTagJumpICase; //!< ‘O‰ñ‚̑啶Žš¬•¶Žš‚𓯈ꎋ - BOOL m_bOldTagJumpAnyWhere; //!< ‘O‰ñ‚Ì•¶Žš—ñ‚Ì“r’†‚Ƀ}ƒbƒ` + int m_nIndex; //!< é¸æŠžã•ã‚ŒãŸè¦ç´ ç•ªå· + TCHAR *m_pszFileName; //!< 編集中ã®ãƒ•ã‚¡ã‚¤ãƒ«å + wchar_t *m_pszKeyword; //!< キーワード(DoModalã®lParam!=0を指定ã—ãŸå ´åˆã«æŒ‡å®šã§ãã‚‹) + int m_nLoop; //!< ã•ã‹ã®ã¼ã‚Œã‚‹éšŽå±¤æ•° + CSortedTagJumpList* m_pcList; //!< タグジャンプ情報 + UINT_PTR m_nTimerId; //!< ã‚¿ã‚¤ãƒžç•ªå· + BOOL m_bTagJumpICase; //!< 大文字å°æ–‡å­—ã‚’åŒä¸€è¦– + BOOL m_bTagJumpAnyWhere; //!< 文字列ã®é€”中ã«ãƒžãƒƒãƒ + BOOL m_bTagJumpExactMatch; //!< 完全一致(ç”»é¢ç„¡ã—) + + int m_nTop; //!< ページã‚ãã‚Šã®è¡¨ç¤ºã®å…ˆé ­(0開始) + bool m_bNextItem; //!< ã¾ã æ¬¡ã«ãƒ’ットã™ã‚‹ã‚‚ã®ãŒã‚ã‚‹ + + // 絞り込ã¿æ¤œç´¢ç”¨ + STagFindState* m_psFindPrev; //!< å‰å›žã®æœ€å¾Œã«æ¤œç´¢ã—ãŸçŠ¶æ…‹ + STagFindState* m_psFind0Match; //!< å‰å›žã®1ã¤ã‚‚Hitã—ãªã‹ã£ãŸæœ€å¾Œã®tags + + CNativeW m_strOldKeyword; //!< å‰å›žã®ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ + BOOL m_bOldTagJumpICase; //!< å‰å›žã®å¤§æ–‡å­—å°æ–‡å­—ã‚’åŒä¸€è¦– + BOOL m_bOldTagJumpAnyWhere; //!< å‰å›žã®æ–‡å­—列ã®é€”中ã«ãƒžãƒƒãƒ SComboBoxItemDeleter m_comboDel; CRecentTagjumpKeyword m_cRecentKeyword; diff --git a/sakura_core/dlg/CDlgTagsMake.cpp b/sakura_core/dlg/CDlgTagsMake.cpp index eb8794a9fa..8e9498b871 100644 --- a/sakura_core/dlg/CDlgTagsMake.cpp +++ b/sakura_core/dlg/CDlgTagsMake.cpp @@ -1,5 +1,5 @@ -/*! @file - @brief ƒ^ƒOƒtƒ@ƒCƒ‹ì¬ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief タグファイル作æˆãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author MIK @date 2003.5.12 @@ -38,11 +38,11 @@ #include "sakura.hh" const DWORD p_helpids[] = { //13700 - IDC_EDIT_TAG_MAKE_FOLDER, HIDC_EDIT_TAG_MAKE_FOLDER, //ƒ^ƒO쬃tƒHƒ‹ƒ_ - IDC_BUTTON_TAG_MAKE_REF, HIDC_BUTTON_TAG_MAKE_REF, //ŽQÆ - IDC_BUTTON_FOLDER_UP, HIDC_BUTTON_TAG_MAKE_FOLDER_UP, // ã - IDC_EDIT_TAG_MAKE_CMDLINE, HIDC_EDIT_TAG_MAKE_CMDLINE, //ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ - IDC_CHECK_TAG_MAKE_RECURSE, HIDC_CHECK_TAG_MAKE_RECURSE, //ƒTƒuƒtƒHƒ‹ƒ_‚à‘ÎÛ + 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, //サブフォルダも対象 IDOK, HIDC_TAG_MAKE_IDOK, IDCANCEL, HIDC_TAG_MAKE_IDCANCEL, IDC_BUTTON_HELP, HIDC_BUTTON_TAG_MAKE_HELP, @@ -58,12 +58,12 @@ CDlgTagsMake::CDlgTagsMake() return; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgTagsMake::DoModal( HINSTANCE hInstance, HWND hwndParent, LPARAM lParam, - const TCHAR* pszPath //ƒpƒX + const TCHAR* pszPath //パス ) { _tcscpy( m_szPath, pszPath ); @@ -76,11 +76,11 @@ BOOL CDlgTagsMake::OnBnClicked( int wID ) switch( wID ) { case IDC_BUTTON_HELP: - /* ƒwƒ‹ƒv */ - MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_TAGS_MAKE) ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + /* ヘルプ */ + MyWinHelp( GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_TAGS_MAKE) ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; - case IDC_BUTTON_TAG_MAKE_REF: /* ŽQÆ */ + case IDC_BUTTON_TAG_MAKE_REF: /* å‚ç…§ */ SelectFolder( GetHwnd() ); return TRUE; @@ -96,7 +96,7 @@ BOOL CDlgTagsMake::OnBnClicked( int wID ) return TRUE; case IDOK: - /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + /* ダイアログデータã®å–å¾— */ ::EndDialog( GetHwnd(), GetData() ); return TRUE; @@ -106,25 +106,25 @@ BOOL CDlgTagsMake::OnBnClicked( int wID ) } - /* Šî’êƒNƒ‰ƒXƒƒ“ƒo */ + /* 基底クラスメンム*/ return CDialog::OnBnClicked( wID ); } /*! - ƒtƒHƒ‹ƒ_‚ð‘I‘ð‚·‚é + フォルダをé¸æŠžã™ã‚‹ - @param hwndDlg [in] ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX‚̃EƒBƒ“ƒhƒEƒnƒ“ƒhƒ‹ + @param hwndDlg [in] ダイアログボックスã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒãƒ³ãƒ‰ãƒ« */ void CDlgTagsMake::SelectFolder( HWND hwndDlg ) { TCHAR szPath[_MAX_PATH + 1]; - /* ƒtƒHƒ‹ƒ_ */ + /* フォルダ */ ::DlgItem_GetText( hwndDlg, IDC_EDIT_TAG_MAKE_FOLDER, szPath, _MAX_PATH ); if( SelectDir( hwndDlg, LS(STR_DLGTAGMAK_SELECTDIR), szPath, szPath ) ) { - //––”ö‚É\\ƒ}[ƒN‚ð’ljÁ‚·‚éD + //末尾ã«\\マークを追加ã™ã‚‹ï¼Ž int pos = _tcslen( szPath ); if( pos > 0 && szPath[ pos - 1 ] != _T('\\') ) { @@ -136,18 +136,18 @@ void CDlgTagsMake::SelectFolder( HWND hwndDlg ) } } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ +/* ダイアログデータã®è¨­å®š */ void CDlgTagsMake::SetData( void ) { - //쬃tƒHƒ‹ƒ_ + //作æˆãƒ•ã‚©ãƒ«ãƒ€ Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_EDIT_TAG_MAKE_FOLDER ), _countof( m_szPath ) ); ::DlgItem_SetText( GetHwnd(), IDC_EDIT_TAG_MAKE_FOLDER, m_szPath ); - //ƒIƒvƒVƒ‡ƒ“ + //オプション m_nTagsOpt = m_pShareData->m_nTagsOpt; if( m_nTagsOpt & 0x0001 ) ::CheckDlgButton( GetHwnd(), IDC_CHECK_TAG_MAKE_RECURSE, TRUE ); - //ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ + //コマンドライン Combo_LimitText( ::GetDlgItem( GetHwnd(), IDC_EDIT_TAG_MAKE_CMDLINE ), _countof( m_pShareData->m_szTagsCmdLine ) ); _tcscpy( m_szTagsCmdLine, m_pShareData->m_szTagsCmdLine ); ::DlgItem_SetText( GetHwnd(), IDC_EDIT_TAG_MAKE_CMDLINE, m_pShareData->m_szTagsCmdLine ); @@ -155,11 +155,11 @@ void CDlgTagsMake::SetData( void ) return; } -/* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ -/* TRUE==³í FALSE==“ü—̓Gƒ‰[ */ +/* ダイアログデータã®å–å¾— */ +/* TRUE==正常 FALSE==入力エラー */ int CDlgTagsMake::GetData( void ) { - //ƒtƒHƒ‹ƒ_ + //フォルダ ::DlgItem_GetText( GetHwnd(), IDC_EDIT_TAG_MAKE_FOLDER, m_szPath, _countof( m_szPath ) ); int length = _tcslen( m_szPath ); if( length > 0 ) @@ -167,12 +167,12 @@ int CDlgTagsMake::GetData( void ) if( m_szPath[ length - 1 ] != _T('\\') ) _tcscat( m_szPath, _T("\\") ); } - //CTAGSƒIƒvƒVƒ‡ƒ“ + //CTAGSオプション m_nTagsOpt = 0; if( ::IsDlgButtonChecked( GetHwnd(), IDC_CHECK_TAG_MAKE_RECURSE ) == BST_CHECKED ) m_nTagsOpt |= 0x0001; m_pShareData->m_nTagsOpt = m_nTagsOpt; - //ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ + //コマンドライン ::DlgItem_GetText( GetHwnd(), IDC_EDIT_TAG_MAKE_CMDLINE, m_szTagsCmdLine, _countof( m_szTagsCmdLine ) ); _tcscpy( m_pShareData->m_szTagsCmdLine, m_szTagsCmdLine ); diff --git a/sakura_core/dlg/CDlgTagsMake.h b/sakura_core/dlg/CDlgTagsMake.h index b9a8b6de8a..e1be40832a 100644 --- a/sakura_core/dlg/CDlgTagsMake.h +++ b/sakura_core/dlg/CDlgTagsMake.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒ^ƒOƒtƒ@ƒCƒ‹ì¬ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief タグファイル作æˆãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ @author MIK @date 2003.5.12 @@ -35,7 +35,7 @@ class CDlgTagsMake; #include "dlg/CDialog.h" /*! - @brief ƒ^ƒOƒtƒ@ƒCƒ‹ì¬ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + @brief タグファイル作æˆãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ */ class CDlgTagsMake : public CDialog { @@ -48,21 +48,21 @@ class CDlgTagsMake : public CDialog /* || Attributes & Operations */ - int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR* ); /* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ + int DoModal( HINSTANCE, HWND, LPARAM, const TCHAR* ); /* モーダルダイアログã®è¡¨ç¤º */ - TCHAR m_szPath[_MAX_PATH+1]; /* ƒtƒHƒ‹ƒ_ */ - TCHAR m_szTagsCmdLine[_MAX_PATH]; /* ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ƒIƒvƒVƒ‡ƒ“(ŒÂ•Ê) */ - int m_nTagsOpt; /* CTAGSƒIƒvƒVƒ‡ƒ“(ƒ`ƒFƒbƒN) */ + TCHAR m_szPath[_MAX_PATH+1]; /* フォルダ */ + TCHAR m_szTagsCmdLine[_MAX_PATH]; /* コマンドラインオプション(個別) */ + int m_nTagsOpt; /* CTAGSオプション(ãƒã‚§ãƒƒã‚¯) */ protected: /* - || ŽÀ‘•ƒwƒ‹ƒpŠÖ” + || 実装ヘルパ関数 */ BOOL OnBnClicked( int ); LPVOID GetHelpIdTable(void); - void SetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚ÌÝ’è */ - int GetData( void ); /* ƒ_ƒCƒAƒƒOƒf[ƒ^‚̎擾 */ + void SetData( void ); /* ダイアログデータã®è¨­å®š */ + int GetData( void ); /* ダイアログデータã®å–å¾— */ private: void SelectFolder( HWND hwndDlg ); diff --git a/sakura_core/dlg/CDlgWinSize.cpp b/sakura_core/dlg/CDlgWinSize.cpp index 4a1675a8b2..f3ce1dd21e 100644 --- a/sakura_core/dlg/CDlgWinSize.cpp +++ b/sakura_core/dlg/CDlgWinSize.cpp @@ -1,8 +1,8 @@ -/*! @file - @brief ƒEƒBƒ“ƒhƒE‚̈ʒu‚Æ‘å‚«‚³ƒ_ƒCƒAƒƒO +/*! @file + @brief ウィンドウã®ä½ç½®ã¨å¤§ãã•ãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Moca - @date 2004/05/13 ì¬ + @date 2004/05/13 ä½œæˆ */ /* Copyright (C) 2004, genta, Moca @@ -36,19 +36,19 @@ #include "sakura.hh" static const DWORD p_helpids[] = { // 2006.10.10 ryoji - IDOK, HIDOK_WINSIZE, // •Â‚¶‚é - IDC_BUTTON_HELP, HIDC_BUTTON_WINSIZE_HELP, // ƒwƒ‹ƒv - IDC_EDIT_WX, HIDC_EDIT_WX, // • - IDC_EDIT_WY, HIDC_EDIT_WY, // ‚‚³ - IDC_EDIT_SX, HIDC_EDIT_SX, // XÀ•W - IDC_EDIT_SY, HIDC_EDIT_SY, // YÀ•W + IDOK, HIDOK_WINSIZE, // é–‰ã˜ã‚‹ + IDC_BUTTON_HELP, HIDC_BUTTON_WINSIZE_HELP, // ヘルプ + IDC_EDIT_WX, HIDC_EDIT_WX, // å¹… + IDC_EDIT_WY, HIDC_EDIT_WY, // 高㕠+ IDC_EDIT_SX, HIDC_EDIT_SX, // X座標 + IDC_EDIT_SY, HIDC_EDIT_SY, // Y座標 // IDC_CHECK_WINPOS, HIDC_CHECK_WINPOS, - IDC_RADIO_WINSIZE_DEF, HIDC_RADIO_WINSIZE_DEF, // ‘å‚«‚³/Žw’肵‚È‚¢ - IDC_RADIO_WINSIZE_SAVE, HIDC_RADIO_WINSIZE_SAVE, // ‘å‚«‚³/Œp³‚·‚é - IDC_RADIO_WINSIZE_SET, HIDC_RADIO_WINSIZE_SET, // ‘å‚«‚³/’¼ÚŽw’è - IDC_RADIO_WINPOS_DEF, HIDC_RADIO_WINPOS_DEF, // ˆÊ’u/Žw’肵‚È‚¢ - IDC_RADIO_WINPOS_SAVE, HIDC_RADIO_WINPOS_SAVE, // ˆÊ’u/Œp³‚·‚é - IDC_RADIO_WINPOS_SET, HIDC_RADIO_WINPOS_SET, // ˆÊ’u/’¼ÚŽw’è + IDC_RADIO_WINSIZE_DEF, HIDC_RADIO_WINSIZE_DEF, // 大ãã•/指定ã—ãªã„ + IDC_RADIO_WINSIZE_SAVE, HIDC_RADIO_WINSIZE_SAVE, // 大ãã•/継承ã™ã‚‹ + IDC_RADIO_WINSIZE_SET, HIDC_RADIO_WINSIZE_SET, // 大ãã•/直接指定 + IDC_RADIO_WINPOS_DEF, HIDC_RADIO_WINPOS_DEF, // ä½ç½®/指定ã—ãªã„ + IDC_RADIO_WINPOS_SAVE, HIDC_RADIO_WINPOS_SAVE, // ä½ç½®/継承ã™ã‚‹ + IDC_RADIO_WINPOS_SET, HIDC_RADIO_WINPOS_SET, // ä½ç½®/直接指定 IDC_COMBO_WINTYPE, HIDC_COMBO_WINTYPE, 0, 0 }; @@ -64,14 +64,14 @@ CDlgWinSize::~CDlgWinSize() } -// !ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ +// !モーダルダイアログã®è¡¨ç¤º int CDlgWinSize::DoModal( HINSTANCE hInstance, HWND hwndParent, - EWinSizeMode& eSaveWinSize, //!< [in,out] ƒEƒBƒ“ƒhƒEˆÊ’uŒp³ - EWinSizeMode& eSaveWinPos, //!< [in,out] ƒEƒBƒ“ƒhƒEƒTƒCƒYŒp³ - int& nWinSizeType, //!< [in,out] ƒEƒBƒ“ƒhƒE‚ÌŽÀsŽž‚Ì‘å‚«‚³ - RECT& rc //!< [in,out] •A‚‚³A¶Aã + EWinSizeMode& eSaveWinSize, //!< [in,out] ウィンドウä½ç½®ç¶™æ‰¿ + EWinSizeMode& eSaveWinPos, //!< [in,out] ウィンドウサイズ継承 + int& nWinSizeType, //!< [in,out] ウィンドウã®å®Ÿè¡Œæ™‚ã®å¤§ãã• + RECT& rc //!< [in,out] å¹…ã€é«˜ã•ã€å·¦ã€ä¸Š ) { m_eSaveWinSize = eSaveWinSize; @@ -86,19 +86,19 @@ int CDlgWinSize::DoModal( return TRUE; } -/*! ‰Šú‰»ˆ— +/*! åˆæœŸåŒ–å‡¦ç† */ BOOL CDlgWinSize::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) { _SetHwnd( hwndDlg ); - Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_NORMAL ) ); //L"•’Ê" - Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_MAXIMIZE ) ); //L"ő剻" - Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_MINIMIZE ) ); //L"(Ŭ‰»)" + Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_NORMAL ) ); //L"普通" + Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_MAXIMIZE ) ); //L"最大化" + Combo_AddString( ::GetDlgItem( GetHwnd(), IDC_COMBO_WINTYPE ), LSW( STR_DLGWINSZ_MINIMIZE ) ); //L"(最å°åŒ–)" UpDown_SetRange( ::GetDlgItem( GetHwnd(), IDC_SPIN_SX ), 30000, 0 ); UpDown_SetRange( ::GetDlgItem( GetHwnd(), IDC_SPIN_SY ), 30000, 0 ); - // ƒEƒBƒ“ƒhƒE‚ÌÀ•W‚ÍAƒ}ƒCƒiƒX’l‚à—LŒøB + // ウィンドウã®åº§æ¨™ã¯ã€ãƒžã‚¤ãƒŠã‚¹å€¤ã‚‚有効。 UpDown_SetRange( ::GetDlgItem( GetHwnd(), IDC_SPIN_WX ), 30000, -30000 ); UpDown_SetRange( ::GetDlgItem( GetHwnd(), IDC_SPIN_WY ), 30000, -30000 ); @@ -109,8 +109,8 @@ BOOL CDlgWinSize::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) BOOL CDlgWinSize::OnBnClicked( int wID ) { switch( wID ){ - case IDC_BUTTON_HELP: // 2006/09/09 novice idC³ - MyWinHelp( GetHwnd(), HELP_CONTEXT, HLP000286 ); // 2006.10.10 ryoji MyWinHelp‚É•ÏX‚É•ÏX + case IDC_BUTTON_HELP: // 2006/09/09 novice id修正 + MyWinHelp( GetHwnd(), HELP_CONTEXT, HLP000286 ); // 2006.10.10 ryoji MyWinHelpã«å¤‰æ›´ã«å¤‰æ›´ return TRUE; case IDC_RADIO_WINPOS_DEF: case IDC_RADIO_WINPOS_SAVE: @@ -127,7 +127,7 @@ BOOL CDlgWinSize::OnBnClicked( int wID ) return CDialog::OnBnClicked( wID ); } -/*! @brief ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX‚Ƀf[ƒ^‚ðÝ’è +/*! @brief ダイアログボックスã«ãƒ‡ãƒ¼ã‚¿ã‚’設定 */ void CDlgWinSize::SetData( void ) { @@ -173,7 +173,7 @@ void CDlgWinSize::SetData( void ) } -/*! ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX‚̃f[ƒ^‚ð“Ç‚Ýo‚· +/*! ダイアログボックスã®ãƒ‡ãƒ¼ã‚¿ã‚’読ã¿å‡ºã™ */ int CDlgWinSize::GetData( void ) { @@ -217,7 +217,7 @@ int CDlgWinSize::GetData( void ) } -/*! —˜—p‰Â”\E•s‰Â‚Ìó‘Ô‚ðXV‚·‚é +/*! 利用å¯èƒ½ãƒ»ä¸å¯ã®çŠ¶æ…‹ã‚’æ›´æ–°ã™ã‚‹ */ void CDlgWinSize::RenewItemState( void ) { diff --git a/sakura_core/dlg/CDlgWinSize.h b/sakura_core/dlg/CDlgWinSize.h index c0f183deff..068986683b 100644 --- a/sakura_core/dlg/CDlgWinSize.h +++ b/sakura_core/dlg/CDlgWinSize.h @@ -1,8 +1,8 @@ -/*! @file - @brief ƒEƒBƒ“ƒhƒE‚̈ʒu‚Æ‘å‚«‚³ƒ_ƒCƒAƒƒO +/*! @file + @brief ウィンドウã®ä½ç½®ã¨å¤§ãã•ãƒ€ã‚¤ã‚¢ãƒ­ã‚° @author Moca - @date 2004/05/13 ì¬ + @date 2004/05/13 ä½œæˆ */ /* Copyright (C) 2004, Moca @@ -34,17 +34,17 @@ #include "dlg/CDialog.h" #include "env/CommonSetting.h" -/*! @brief ˆÊ’u‚Æ‘å‚«‚³‚ÌÝ’èƒ_ƒCƒAƒƒO +/*! @brief ä½ç½®ã¨å¤§ãã•ã®è¨­å®šãƒ€ã‚¤ã‚¢ãƒ­ã‚° - ‹¤’ÊÝ’è‚̃EƒBƒ“ƒhƒEÝ’è‚ÅCƒEƒBƒ“ƒhƒEˆÊ’u‚ðŽw’è‚·‚邽‚ß‚É•â•“I‚É - Žg—p‚³‚ê‚éƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX + 共通設定ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦è¨­å®šã§ï¼Œã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ä½ç½®ã‚’指定ã™ã‚‹ãŸã‚ã«è£œåŠ©çš„ã« + 使用ã•ã‚Œã‚‹ãƒ€ã‚¤ã‚¢ãƒ­ã‚°ãƒœãƒƒã‚¯ã‚¹ */ class CDlgWinSize : public CDialog { public: CDlgWinSize(); ~CDlgWinSize(); - int DoModal( HINSTANCE, HWND, EWinSizeMode&, EWinSizeMode&, int&, RECT& ); //!< ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ + int DoModal( HINSTANCE, HWND, EWinSizeMode&, EWinSizeMode&, int&, RECT& ); //!< モーダルダイアログã®è¡¨ç¤º protected: @@ -57,9 +57,9 @@ class CDlgWinSize : public CDialog void RenewItemState( void ); private: - EWinSizeMode m_eSaveWinSize; //!< ƒEƒBƒ“ƒhƒEƒTƒCƒY‚Ì•Û‘¶: 0/ƒfƒtƒHƒ‹ƒgC1/Œp³C2/Žw’è - EWinSizeMode m_eSaveWinPos; //!< ƒEƒBƒ“ƒhƒEˆÊ’u‚Ì•Û‘¶: 0/ƒfƒtƒHƒ‹ƒgC1/Œp³C2/Žw’è - int m_nWinSizeType; //!< ƒEƒBƒ“ƒhƒE•\Ž¦•û–@: 0/•W€C1/ő剻C2/Ŭ‰» + EWinSizeMode m_eSaveWinSize; //!< ウィンドウサイズã®ä¿å­˜: 0/デフォルト，1/継承，2/指定 + EWinSizeMode m_eSaveWinPos; //!< ウィンドウä½ç½®ã®ä¿å­˜: 0/デフォルト，1/継承，2/指定 + int m_nWinSizeType; //!< ウィンドウ表示方法: 0/標準，1/最大化，2/最å°åŒ– RECT m_rc; }; diff --git a/sakura_core/dlg/CDlgWindowList.cpp b/sakura_core/dlg/CDlgWindowList.cpp index 83678fca09..fc2673260e 100644 --- a/sakura_core/dlg/CDlgWindowList.cpp +++ b/sakura_core/dlg/CDlgWindowList.cpp @@ -1,15 +1,15 @@ -/*! @file - @brief ƒEƒBƒ“ƒhƒEˆê——ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief ウィンドウ一覧ダイアログボックス @author Moca - @date 2015.03.07 Moca CDlgWindowList.cpp‚ðŒ³‚Éì¬ + @date 2015.03.07 Moca CDlgWindowList.cppã‚’å…ƒã«ä½œæˆ */ /* Copyright (C) 1998-2001, Norio Nakatani Copyright (C) 2001, Stonee, genta, JEPRO, YAZAKI Copyright (C) 2002, aroka, MIK, Moca Copyright (C) 2003, MIK, genta - Copyright (C) 2004, MIK, genta, ‚¶‚イ‚¶ + Copyright (C) 2004, MIK, genta, ã˜ã‚…ã†ã˜ Copyright (C) 2006, ryoji Copyright (C) 2009, ryoji Copyright (C) 2015, Moca @@ -46,14 +46,14 @@ static const SAnchorList anchorList[] = { CDlgWindowList::CDlgWindowList() : CDialog(true) { - /* ƒTƒCƒY•ÏXŽž‚Ɉʒu‚ð§Œä‚·‚éƒRƒ“ƒgƒ[ƒ‹” */ + /* サイズ変更時ã«ä½ç½®ã‚’制御ã™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«æ•° */ assert(_countof(anchorList) == _countof(m_rcItems)); m_ptDefaultSize.x = -1; m_ptDefaultSize.y = -1; return; } -/* ƒ‚[ƒ_ƒ‹ƒ_ƒCƒAƒƒO‚Ì•\Ž¦ */ +/* モーダルダイアログã®è¡¨ç¤º */ int CDlgWindowList::DoModal( HINSTANCE hInstance, HWND hwndParent, @@ -67,7 +67,7 @@ BOOL CDlgWindowList::OnBnClicked(int wID) { switch(wID){ case IDC_BUTTON_HELP: - /* ƒwƒ‹ƒv */ + /* ヘルプ */ MyWinHelp(GetHwnd(), HELP_CONTEXT, ::FuncID_To_HelpContextID(F_DLGWINLIST)); return TRUE; case IDC_BUTTON_SAVE: diff --git a/sakura_core/dlg/CDlgWindowList.h b/sakura_core/dlg/CDlgWindowList.h index aba0129407..15c211293a 100644 --- a/sakura_core/dlg/CDlgWindowList.h +++ b/sakura_core/dlg/CDlgWindowList.h @@ -1,5 +1,5 @@ -/*! @file - @brief ƒtƒ@ƒCƒ‹ˆê——ƒ_ƒCƒAƒƒOƒ{ƒbƒNƒX +/*! @file + @brief ファイル一覧ダイアログボックス @author Moca @date 2015.03.07 From 5b47e2055a5e9d6eb8bec8ce2ede0e0eb93a79ef Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 11 Jun 2018 13:00:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=99=E3=82=8B=E3=81=A8=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E5=91=A8=E3=82=8A=E3=81=A7=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=81=8C=E7=94=9F=E3=81=98=E3=82=8B=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=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 --- sakura_core/dlg/CDlgGrep.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sakura_core/dlg/CDlgGrep.cpp b/sakura_core/dlg/CDlgGrep.cpp index cd576ac8ee..ea1d0e4f30 100644 --- a/sakura_core/dlg/CDlgGrep.cpp +++ b/sakura_core/dlg/CDlgGrep.cpp @@ -652,11 +652,6 @@ int CDlgGrep::GetData( void ) m_pShareData->m_Common.m_sSearch.m_bGrepOutputBaseFolder = m_bGrepOutputBaseFolder; m_pShareData->m_Common.m_sSearch.m_bGrepSeparateFolder = m_bGrepSeparateFolder; -//ã‚„ã‚ã¾ã—㟠-// if( 0 == wcslen( m_szText ) ){ -// WarningMessage( GetHwnd(), _T("検索ã®ã‚­ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã‚’指定ã—ã¦ãã ã•ã„。") ); -// return FALSE; -// } if( 0 != auto_strlen( m_szFile ) ){ CGrepEnumKeys enumKeys; int nErrorNo = enumKeys.SetFileKeys( m_szFile );