diff --git a/resource/mytool.bmp b/resource/mytool.bmp index 3f4a127c4c..593bb18808 100644 Binary files a/resource/mytool.bmp and b/resource/mytool.bmp differ diff --git a/sakura/sakura.sln b/sakura/sakura.sln index 82519867c0..1651162980 100644 --- a/sakura/sakura.sln +++ b/sakura/sakura.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +# Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sakura", "sakura.vcproj", "{DFFC20C2-2220-4135-847D-873E6ACE13E3}" ProjectSection(ProjectDependencies) = postProject {0F2918B0-23E3-42E8-A1A8-8739F726A23E} = {0F2918B0-23E3-42E8-A1A8-8739F726A23E} diff --git a/sakura_core/CBackupAgent.cpp b/sakura_core/CBackupAgent.cpp index 4281720fa3..3444c9c6ab 100644 --- a/sakura_core/CBackupAgent.cpp +++ b/sakura_core/CBackupAgent.cpp @@ -469,7 +469,8 @@ bool CBackupAgent::FormatBackUpPath( { // 2012.12.26 aroka �ڍאݒ�̃t�@�C���ۑ������ƌ��ݎ����ŏ��������킹�� SYSTEMTIME SystemTime; - ::GetSystemTime(&SystemTime); // ���ݎ������擾 + // 2016.07.28 UTC�����[�J�������ɕύX + ::GetLocalTime(&SystemTime); // ���ݎ������擾 if( !GetDateTimeFormat( szFormat, _countof(szFormat), bup_setting.m_szBackUpPathAdvanced , SystemTime ) ){ return false; diff --git a/sakura_core/CSearchAgent.cpp b/sakura_core/CSearchAgent.cpp index 0cfa5ccbc2..97d86f663a 100644 --- a/sakura_core/CSearchAgent.cpp +++ b/sakura_core/CSearchAgent.cpp @@ -495,10 +495,10 @@ int CSearchAgent::SearchWord( if( sSearchOption.bRegularExp ){ nLinePos = ptSerachBegin.GetY2(); // �����s�������J�n�s pDocLine = m_pcDocLineMgr->GetLine( nLinePos ); - //�O������ + // ������� if( eDirection == SEARCH_BACKWARD ){ // - // �O��(��)����(���K�\��) + // ���(��)����(���K�\��) // nHitTo = ptSerachBegin.x; // �����J�n�ʒu nIdxPos = 0; @@ -546,10 +546,10 @@ int CSearchAgent::SearchWord( } } } - //������� + // �O������ else { // - // �������(���K�\��) + // �O������(���K�\��) // nIdxPos = ptSerachBegin.x; while( NULL != pDocLine ){ @@ -594,7 +594,7 @@ int CSearchAgent::SearchWord( �p�P���C/C++���ʎq�Ȃǂ̌��������Ȃ�q�b�g���܂��B */ - // �O������ + // ������� if( eDirection == SEARCH_BACKWARD ){ nLinePos = ptSerachBegin.GetY2(); pDocLine = m_pcDocLineMgr->GetLine( nLinePos ); @@ -638,7 +638,7 @@ int CSearchAgent::SearchWord( } } } - // ������� + // �O������ else{ nLinePos = ptSerachBegin.GetY2(); pDocLine = m_pcDocLineMgr->GetLine( nLinePos ); @@ -668,7 +668,7 @@ int CSearchAgent::SearchWord( //���ʂ̌��� (���K�\���ł��P��P�ʂł��Ȃ�) else{ const int nPatternLen = pattern.GetLen(); - //�O������ + // ������� if( eDirection == SEARCH_BACKWARD ){ nLinePos = ptSerachBegin.GetY2(); nHitTo = ptSerachBegin.x; @@ -725,7 +725,7 @@ int CSearchAgent::SearchWord( nRetVal = 0; goto end_of_func; } - //������� + // �O������ else{ nIdxPos = ptSerachBegin.x; nLinePos = ptSerachBegin.GetY2(); diff --git a/sakura_core/_main/CCommandLine.cpp b/sakura_core/_main/CCommandLine.cpp index dc76df4487..b4d738c141 100644 --- a/sakura_core/_main/CCommandLine.cpp +++ b/sakura_core/_main/CCommandLine.cpp @@ -32,35 +32,35 @@ #include "env/CSakuraEnvironment.h" /* �R�}���h���C���I�v�V�����p�萔 */ -#define CMDLINEOPT_R 1002 -#define CMDLINEOPT_NOWIN 1003 -#define CMDLINEOPT_WRITEQUIT 1004 -#define CMDLINEOPT_GREPMODE 1100 -#define CMDLINEOPT_GREPDLG 1101 -#define CMDLINEOPT_DEBUGMODE 1999 -#define CMDLINEOPT_NOMOREOPT 1998 -#define CMDLINEOPT_AT 11 -#define CMDLINEOPT_X 1 -#define CMDLINEOPT_Y 2 -#define CMDLINEOPT_VX 3 -#define CMDLINEOPT_VY 4 -#define CMDLINEOPT_TYPE 5 -#define CMDLINEOPT_CODE 6 -#define CMDLINEOPT_SX 7 -#define CMDLINEOPT_SY 8 -#define CMDLINEOPT_WX 9 -#define CMDLINEOPT_WY 10 -#define CMDLINEOPT_GKEY 101 -#define CMDLINEOPT_GFILE 102 -#define CMDLINEOPT_GFOLDER 103 -#define CMDLINEOPT_GOPT 104 -#define CMDLINEOPT_GCODE 105 -#define CMDLINEOPT_M 106 -#define CMDLINEOPT_MTYPE 107 -#define CMDLINEOPT_GREPR 108 -#define CMDLINEOPT_GROUP 500 -#define CMDLINEOPT_PROF 501 -#define CMDLINEOPT_PROFMGR 502 +#define CMDLINEOPT_R 1002 //!< �r���[���[�h +#define CMDLINEOPT_NOWIN 1003 //!< �^�X�N�g���C�̂݋N�� +#define CMDLINEOPT_WRITEQUIT 1004 //!< SakuExt�Ƃ̘A����p +#define CMDLINEOPT_GREPMODE 1100 //!< Grep���s���[�h�ŋN�� +#define CMDLINEOPT_GREPDLG 1101 //!< �T�N���G�f�B�^���N������Ɠ�����Grep�_�C�A���O��\�� +#define CMDLINEOPT_DEBUGMODE 1999 //!< �A�E�g�v�b�g�p�̃E�B���h�E�Ƃ��ċN�� +#define CMDLINEOPT_NOMOREOPT 1998 //!< ����ȍ~�������� +#define CMDLINEOPT_AT 11 //!< ���X�|���X�t�@�C�����w�� +#define CMDLINEOPT_X 1 //!< �t�@�C�����J�����Ƃ��̃J�[�\���̌��ʒu���w�� +#define CMDLINEOPT_Y 2 //!< �t�@�C�����J�����Ƃ��̃J�[�\���̍s�ʒu���w�� +#define CMDLINEOPT_VX 3 //!< �X�N���[���F�E�B���h�E���[�̌��ʒu +#define CMDLINEOPT_VY 4 //!< �X�N���[���F�E�B���h�E��[�̍s�ʒu +#define CMDLINEOPT_TYPE 5 //!< �^�C�v�ʐݒ� +#define CMDLINEOPT_CODE 6 //!< �����R�[�h��� +#define CMDLINEOPT_SX 7 //!< �E�B���h�E�̕� +#define CMDLINEOPT_SY 8 //!< �E�B���h�E�̍��� +#define CMDLINEOPT_WX 9 //!< �E�B���h�E�����X���W +#define CMDLINEOPT_WY 10 //!< �E�B���h�E�����Y���W +#define CMDLINEOPT_GKEY 101 //!< Grep�̌��������� +#define CMDLINEOPT_GFILE 102 //!< Grep�̌����Ώۂ̃t�@�C�� +#define CMDLINEOPT_GFOLDER 103 //!< Grep�̌����Ώۂ̃t�H���_ +#define CMDLINEOPT_GOPT 104 //!< Grep�̏��� +#define CMDLINEOPT_GCODE 105 //!< Grep�ł̕����R�[�h���w�� +#define CMDLINEOPT_M 106 //!< �N�����Ɏ��s����}�N���̃t�@�C�������w�� +#define CMDLINEOPT_MTYPE 107 //!< �}�N���̎�ނ��g���q���Ŏw�� +#define CMDLINEOPT_GREPR 108 //!< Grep�̒u�������� +#define CMDLINEOPT_GROUP 500 //!< �^�u���[�h�̃O���[�v���w�肵�ĊJ�� +#define CMDLINEOPT_PROF 501 //!< �v���t�@�C����I�� +#define CMDLINEOPT_PROFMGR 502 //!< �v���t�@�C���}�l�[�W�����N�����ɕ\�� /*! �R�}���h���C���̃`�F�b�N���s���āA�I�v�V�����ԍ��� @@ -537,11 +537,6 @@ CCommandLine::CCommandLine() m_bSetProfile = false; m_gi.bGrepSubFolder = false; m_gi.sGrepSearchOption.Reset(); - /* - m_gi.sGrepSearchOption.bLoHiCase = false; - m_gi.bGrepRegularExp = false; - m_gi.bGrepWordOnly = false; - */ m_gi.bGrepCurFolder = false; m_gi.bGrepStdout = false; m_gi.bGrepHeader = true; diff --git a/sakura_core/_main/global.h b/sakura_core/_main/global.h index 7fc9438eb7..af9b990a00 100644 --- a/sakura_core/_main/global.h +++ b/sakura_core/_main/global.h @@ -132,23 +132,31 @@ enum MOUSEFUNCTION_ASSIGN { // 2008.05.30 nasukoji �e�L�X�g�̐܂�Ԃ����@ enum WRAP_TEXT_WRAP_METHOD { - WRAP_NO_TEXT_WRAP = 0, // �܂�Ԃ��Ȃ��i�X�N���[���o�[���e�L�X�g���ɍ��킹��j - WRAP_SETTING_WIDTH, // �w�茅�Ő܂�Ԃ� - WRAP_WINDOW_WIDTH, // �E�[�Ő܂�Ԃ� + WRAP_NO_TEXT_WRAP = 0, //!< �܂�Ԃ��Ȃ��i�X�N���[���o�[���e�L�X�g���ɍ��킹��j + WRAP_SETTING_WIDTH, //!< �w�茅�Ő܂�Ԃ� + WRAP_WINDOW_WIDTH, //!< �E�[�Ő܂�Ԃ� }; // 2009.07.06 syat �����J�E���g���@ enum ESelectCountMode { - SELECT_COUNT_TOGGLE = 0, // �����J�E���g���@���g�O�� - SELECT_COUNT_BY_CHAR = 1, // �������ŃJ�E���g - SELECT_COUNT_BY_BYTE = 2 // �o�C�g���ŃJ�E���g + SELECT_COUNT_TOGGLE = 0, //!< �����J�E���g���@���g�O�� + SELECT_COUNT_BY_CHAR = 1, //!< �������ŃJ�E���g + SELECT_COUNT_BY_BYTE = 2 //!< �o�C�g���ŃJ�E���g +}; + +//!�������[�h +enum ESearchMode { + SEARCH_NONE = 0, //!< �C���N�������^���T�[�`���� + SEARCH_NORMAL = 1, //!< �ʏ�C���N�������^���T�[�` + SEARCH_REGEXP = 2, //!< ���K�\���C���N�������^���T�[�` + SEARCH_MIGEMO = 3, //!< MIGEMO�C���N�������^���T�[�` }; //2007.09.06 kobake �lj� //!�������� enum ESearchDirection{ - SEARCH_BACKWARD = 0, //�O������ (�O������) - SEARCH_FORWARD = 1, //������� (��������) (����) + SEARCH_BACKWARD = 0, //!< ������� (�O������) + SEARCH_FORWARD = 1, //!< �O������ (��������) (����) }; //2007.09.06 kobake �lj� diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index 6d04aeca7c..af69462211 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -261,8 +261,8 @@ bool CClipboard::SetHtmlText(const CNativeW& cmemBUf) /*! �e�L�X�g���擾���� @param [out] cmemBuf �擾�����e�L�X�g�̊i�[�� - @param [in/out] pbColumnSelect ��`�I���`�� - @param [in/out] pbLineSelect �s�I���`�� + @param [in,out] pbColumnSelect ��`�I���`�� + @param [in,out] pbLineSelect �s�I���`�� @param [in] cEol HDROP�`���̂Ƃ��̉��s�R�[�h @param [in] uGetFormat �N���b�v�{�[�h�`�� */ diff --git a/sakura_core/apiwrap/StdControl.cpp b/sakura_core/apiwrap/StdControl.cpp index 1ed8988d2d..895e412948 100644 --- a/sakura_core/apiwrap/StdControl.cpp +++ b/sakura_core/apiwrap/StdControl.cpp @@ -32,4 +32,20 @@ namespace ApiWrap{ return GetDlgItemText(hwndDlg, nIDDlgItem, TcharReceiver(str,nMaxCount), nMaxCount); } + bool TreeView_GetItemTextVector(HWND hwndTree, TVITEM& item, std::vector& vecStr) + { + BOOL ret = FALSE; + int nBufferSize = 64; + while( FALSE == ret ){ + nBufferSize *= 2; + if( 0x10000 < nBufferSize ){ + break; + } + vecStr.resize(nBufferSize); + item.pszText = &vecStr[0]; + item.cchTextMax = (int)vecStr.size(); + ret = TreeView_GetItem(hwndTree, &item); + } + return FALSE != ret; + } } diff --git a/sakura_core/apiwrap/StdControl.h b/sakura_core/apiwrap/StdControl.h index 34813bb205..a126957a07 100644 --- a/sakura_core/apiwrap/StdControl.h +++ b/sakura_core/apiwrap/StdControl.h @@ -37,6 +37,7 @@ */ #include "../util/tchar_convert.h" +#include namespace ApiWrap{ @@ -175,6 +176,7 @@ namespace ApiWrap{ UINT DlgItem_GetText(HWND hwndDlg, int nIDDlgItem, WCHAR* str, int nMaxCount); //GetDlgItemText + bool TreeView_GetItemTextVector(HWND hwndTree, TVITEM& item, std::vector& vecStr); } using namespace ApiWrap; diff --git a/sakura_core/charset/charcode.cpp b/sakura_core/charset/charcode.cpp index 903f14ac7a..b0f8deb9c1 100644 --- a/sakura_core/charset/charcode.cpp +++ b/sakura_core/charset/charcode.cpp @@ -30,7 +30,7 @@ /*! �L�[���[�h�L�����N�^ */ const unsigned char gm_keyword_char[128] = { /* 0 1 2 3 4 5 6 7 8 9 A B C D E F : 0123456789ABCDEF */ - CK_NULL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_TAB, CK_LF, CK_CTRL, CK_CTRL, CK_CR, CK_CTRL, CK_CTRL, /* 0: ................ */ + CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_TAB, CK_LF, CK_CTRL, CK_CTRL, CK_CR, CK_CTRL, CK_CTRL, /* 0: ................ */ CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, CK_CTRL, /* 1: ................ */ CK_SPACE, CK_ETC, CK_ETC, CK_UDEF, CK_UDEF, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, /* 2: !"#$%&'()*+,-./ */ CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_CSYM, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, CK_ETC, /* 3: 0123456789:;<=>? */ @@ -97,7 +97,7 @@ namespace WCODE //if(wc==TAB)return false; //return iswcntrl(wc)!=0; - return (wc<128 && gm_keyword_char[wc]==CK_CTRL); + return (wc<_countof(gm_keyword_char) && gm_keyword_char[wc]==CK_CTRL); } #if 0 @@ -265,7 +265,7 @@ namespace WCODE { SIZE size={m_han_size.cx*2,0}; //�֐������s�����Ƃ��̂��Ƃ��l���A�S�p���ŏ��������Ă��� // 2014.12.21 �R���g���[���R�[�h�̕\���ENUL��1px���ɂȂ�̂��X�y�[�X���ɂ��� - if (WCODE::IsControlCode(c) || L'\0' == c) { + if (WCODE::IsControlCode(c)) { GetTextExtentPoint32W_AnyBuild(SelectHDC(c),&c,1,&size); const int nCx = size.cx; const wchar_t proxyChar = ((L'\0' == c) ? ' ' : L'�'); diff --git a/sakura_core/charset/charcode.h b/sakura_core/charset/charcode.h index 80be83a9d3..d215ae97b9 100644 --- a/sakura_core/charset/charcode.h +++ b/sakura_core/charset/charcode.h @@ -238,7 +238,9 @@ namespace WCODE //! �L�����������ǂ��� inline bool IsCyrillic(wchar_t c) { - return c>=0x0410 && c<=0x044F; + return (c>=0x0400 && c<=0x052F) // Cyrillic, Cyrillic Supplement + || (c>=0x2DE0 && c<=0x2DFF) // Cyrillic Extended-A + || (c>=0xA640 && c<=0xA69F); // Cyrillic Extended-B } //! BOX DRAWING ���� ���ǂ��� diff --git a/sakura_core/charset/codechecker.cpp b/sakura_core/charset/codechecker.cpp index 1fe52fae20..9307528f2e 100644 --- a/sakura_core/charset/codechecker.cpp +++ b/sakura_core/charset/codechecker.cpp @@ -588,7 +588,7 @@ EndFunc:; \u800�`\uFFFF (UCS2) 0000 0000 0000 0000 aaaa bbbb cccc dddd -> 1110 aaaa 10bb bbcc 10cc dddd --- \u10000�`\u1FFFFF (UCS4) 0000 0000 000a bbbb cccc dddd eeee ffff -> 1111 0abb 10bb cccc 10dd ddee 10ee ffff -�Q�l�����F�uUCS��UTF�vhttp://homepage1.nifty.com/nomenclator/unicode/ucs_utf.htm +�Q�l�����F�uUCS��UTF�vhttp://nomenclator.la.coocan.jp/unicode/ucs_utf.htm * --------------------------------------------------------------------------------------------------------------- */ /*! @@ -654,7 +654,7 @@ int CheckUtf8Char( const char *pS, const int nLen, ECharSet *peCharset, const bo goto EndFunc; } }else - if( 3 < nLen && (c0 & 0xf8) == 0xf0 ){ + if( 3 < nLen && (c0 & 0xf8) == 0xf0 ){ // ��P�o�C�g��11110abb�̏ꍇ c1 = pS[1]; c2 = pS[2]; c3 = pS[3]; @@ -709,25 +709,28 @@ int CheckUtf8Char( const char *pS, const int nLen, ECharSet *peCharset, const bo return ncwidth; } +/*! + UTF-8 �������`�F�b�N�@(�g�ݍ��킹������l���Ȃ�) + + @note �r���܂�UTF-8�̃G���R�[�f�B���O�������Ă���΁ACHARSET_BINARY2��ݒ肷�� + + @date 2015.12.30 novice ��P�o�C�g��11110abb�̂Ƃ��AnLen���傫���l��Ԃ��̂��C�� +*/ int CheckUtf8Char2( const char *pS, const int nLen, ECharSet *peCharset, const bool bAllow4byteCode, const int nOption ) { unsigned char c0, c1, c2; int ncwidth; ECharSet echarset; - ECharSet echarset1; - int nclen1; - if( nLen < 1 ){ return 0; } - nclen1 = CheckUtf8Char( pS, nLen, &echarset1, true, 0 ); - echarset = echarset1; + ncwidth = CheckUtf8Char( pS, nLen, &echarset, true, 0 ); c0 = pS[0]; - if( echarset1 == CHARSET_BINARY ){ + if( echarset == CHARSET_BINARY ){ if( 1 == nLen && (c0 & 0xe0) == 0xc0 ){ // ��P�o�C�g��110aaabb�̏ꍇ - echarset = CHARSET_BINARY2; + echarset = CHARSET_BINARY2; // ������f��(�p���p) ncwidth = 1; goto EndFunc; }else @@ -735,6 +738,7 @@ int CheckUtf8Char2( const char *pS, const int nLen, ECharSet *peCharset, const b c1 = pS[1]; // ��Q�o�C�g��10bbbbcc�A��R�o�C�g��10ccdddd�̏ꍇ if( (c1 & 0xc0) == 0x80 ){ + echarset = CHARSET_BINARY2; // ������f��(�p���p) ncwidth = 2; // �R�o�C�g�R�[�h�̐擪2�o�C�g�ł��� if( (c0 & 0x0f) == 0 && (c1 & 0x20) == 0 ){ // �f�R�[�h�ł��Ȃ�.(�����ϊ��s�—̈�) @@ -754,12 +758,12 @@ int CheckUtf8Char2( const char *pS, const int nLen, ECharSet *peCharset, const b goto EndFunc; } }else - if( 1 == nLen && (c0 & 0xf0) == 0xe0 ){ - echarset = CHARSET_BINARY2; + if( 1 == nLen && (c0 & 0xf0) == 0xe0 ){ // ��P�o�C�g��1110aaaa�̏ꍇ + echarset = CHARSET_BINARY2; // ������f��(�p���p) ncwidth = 1; goto EndFunc; }else - if( 0 < nLen && nLen <= 3 && (c0 & 0xf8) == 0xf0 ){ + if( 0 < nLen && nLen <= 3 && (c0 & 0xf8) == 0xf0 ){ // ��P�o�C�g��11110abb�̏ꍇ if( 1 < nLen ){ c1 = pS[1]; }else{ @@ -772,8 +776,8 @@ int CheckUtf8Char2( const char *pS, const int nLen, ECharSet *peCharset, const b } // ��2�o�C�g��10bbcccc�A��3�o�C�g��10ddddee if( (c1 & 0xc0) == 0x80 && (c2 & 0xc0) == 0x80 ){ - ncwidth = std::max(nLen,3); // �S�o�C�g�R�[�h�ł��� - echarset = CHARSET_UNI_SURROG; // �T���Q�[�g�y�A�̕����i�������j + ncwidth = nLen; // �S�o�C�g�R�[�h�ł��� + echarset = CHARSET_BINARY2; // ������f��(�p���p) // ��1�o�C�g��abb=000�A��2�o�C�g��bb=00�̏ꍇ�i\u10000�����ɕϊ������j if( (c0 & 0x07) == 0 && (c1 & 0x30) == 0 ){ // �f�R�[�h�ł��Ȃ�.(�����ϊ��s�—̈�) @@ -795,7 +799,6 @@ int CheckUtf8Char2( const char *pS, const int nLen, ECharSet *peCharset, const b } } }else{ - ncwidth = nclen1; goto EndFunc; } diff --git a/sakura_core/cmd/CViewCommander_Cursor.cpp b/sakura_core/cmd/CViewCommander_Cursor.cpp index 711833e47e..13004274a8 100644 --- a/sakura_core/cmd/CViewCommander_Cursor.cpp +++ b/sakura_core/cmd/CViewCommander_Cursor.cpp @@ -169,7 +169,7 @@ int CViewCommander::Command_LEFT( bool bSelect, bool bRepeat ) bUnderlineDoNotOFF = false; //�I����ԂȂ�A���_�[���C���������s�� } bool bMoveCaretLine = false; - int nRepeat = bRepeat ? 2 : 1; + int nRepeat = bRepeat ? GetDllShareData().m_Common.m_sGeneral.m_nRepeatedMoveCaretNum : 1; // �ړ������ int nRes = 0; CLayoutPoint ptCaretMove = GetCaret().GetCaretLayoutPos(); for( int nRepCount = 0; nRepCount < nRepeat; ++nRepCount ) { @@ -261,7 +261,7 @@ int CViewCommander::Command_LEFT( bool bSelect, bool bRepeat ) -/* �J�[�\���E�ړ� +/*! @brief �J�[�\���E�ړ� @date 2014.01.10 Moca �L�[���s�[�g���AMoveCursor����x�ɂ܂Ƃ߂� */ void CViewCommander::Command_RIGHT( bool bSelect, bool bIgnoreCurrentSelection, bool bRepeat ) @@ -271,7 +271,7 @@ void CViewCommander::Command_RIGHT( bool bSelect, bool bIgnoreCurrentSelection, bUnderlineDoNotOFF = false; //�I����ԂȂ�A���_�[���C���������s�� } bool bMoveCaretLine = false; - int nRepeat = bRepeat ? 2 : 1; // �ړ������ + int nRepeat = bRepeat ? GetDllShareData().m_Common.m_sGeneral.m_nRepeatedMoveCaretNum : 1; // �ړ������ CLayoutPoint ptCaretMove = GetCaret().GetCaretLayoutPos(); for( int nRepCount = 0; nRepCount < nRepeat; ++nRepCount ) { // 2003.06.28 Moca [EOF]�݂̂̍s�ɃJ�[�\��������Ƃ��ɉE�������Ă��I���������ł��Ȃ����� @@ -1139,7 +1139,7 @@ void CViewCommander::Command_GOPREVPARAGRAPH( bool bSelect ) bool nFirstLineIsEmptyLine = false; /* �܂��́A���݈ʒu����s�i�X�y�[�X�A�^�u�A���s�L���݂̂̍s�j���ǂ������� */ - if ( ( pcDocLine = GetDocument()->m_cDocLineMgr.GetLine( GetCaret().GetCaretLogicPos().GetY2() + CLogicInt(nCaretPointer) ) ) != NULL ){ + if ( ( pcDocLine = GetDocument()->m_cDocLineMgr.GetLine( GetCaret().GetCaretLogicPos().GetY2() + CLogicInt(nCaretPointer) ) ) != NULL ){ nFirstLineIsEmptyLine = pcDocLine->IsEmptyLine(); nCaretPointer--; } @@ -1190,6 +1190,9 @@ void CViewCommander::Command_GOPREVPARAGRAPH( bool bSelect ) } // EOF�܂ŗ�����A�ړI�̏ꏊ�܂ł����̂ňړ��I���B + if( GetCaret().GetCaretLogicPos().y + nCaretPointer < CLogicYInt(0) ){ + return; + } /* �ړ��������v�Z */ CLayoutPoint ptCaretPos_Layo; diff --git a/sakura_core/cmd/CViewCommander_Edit_advanced.cpp b/sakura_core/cmd/CViewCommander_Edit_advanced.cpp index a79f53bfd3..faff8fbf6f 100644 --- a/sakura_core/cmd/CViewCommander_Edit_advanced.cpp +++ b/sakura_core/cmd/CViewCommander_Edit_advanced.cpp @@ -777,10 +777,12 @@ bool SortByKeyDesc(SORTDATA* pst1, SORTDATA* pst2) {return CStringRef_comp(pst1- } lastData.cmemLine._SetStringLength(nLen); } - // 2010.08.22 Moca swap�ō폜 { - std::vector temp; - temp.swap(sta); + // 2016.03.04 Moca sta���f�[�^�̍폜�Y��C�� + int nSize = (int)sta.size(); + for(int k = 0; k < nSize; k++){ + delete sta[k]; + } } CLayoutRange sSelectOld_Layout; diff --git a/sakura_core/cmd/CViewCommander_Search.cpp b/sakura_core/cmd/CViewCommander_Search.cpp index b2ece5ce7f..7119300784 100644 --- a/sakura_core/cmd/CViewCommander_Search.cpp +++ b/sakura_core/cmd/CViewCommander_Search.cpp @@ -197,14 +197,14 @@ re_do:; nSearchResult = GetDocument()->m_cLayoutMgr.SearchWord( nLineNum, // �����J�n���C�A�E�g�s nIdx, // �����J�n�f�[�^�ʒu - SEARCH_FORWARD, // 0==�O������ 1==������� + SEARCH_FORWARD, // �O������ &sRangeA, // �}�b�`���C�A�E�g�͈� m_pCommanderView->m_sSearchPattern ); }else{ nSearchResult = CSearchAgent(&GetDocument()->m_cDocLineMgr).SearchWord( CLogicPoint(nIdx, nLineNumLogic), - SEARCH_FORWARD, // 0==�O������ 1==������� + SEARCH_FORWARD, // �O������ pcSelectLogic, m_pCommanderView->m_sSearchPattern ); @@ -404,7 +404,7 @@ re_do:; // hor if( GetDocument()->m_cLayoutMgr.SearchWord( nLineNum, // �����J�n���C�A�E�g�s nIdx, // �����J�n�f�[�^�ʒu - SEARCH_BACKWARD, // 0==�O������ 1==������� + SEARCH_BACKWARD, // ������� &sRangeA, // �}�b�`���C�A�E�g�͈� m_pCommanderView->m_sSearchPattern ) ){ diff --git a/sakura_core/cmd/CViewCommander_Settings.cpp b/sakura_core/cmd/CViewCommander_Settings.cpp index f7effa89eb..8679d7276c 100644 --- a/sakura_core/cmd/CViewCommander_Settings.cpp +++ b/sakura_core/cmd/CViewCommander_Settings.cpp @@ -284,7 +284,7 @@ void CViewCommander::Command_SETFONTSIZE( int fontSize, int shift, int mode ) INT nPointSize; // TrueType�̂ݑΉ� - if( OUT_STROKE_PRECIS != lf.lfOutPrecision) { + if( OUT_STROKE_PRECIS != lf.lfOutPrecision && OUT_PS_ONLY_PRECIS != lf.lfOutPrecision ) { return; } diff --git a/sakura_core/config/system_constants.h b/sakura_core/config/system_constants.h index 3ba928c952..4f8e674bea 100644 --- a/sakura_core/config/system_constants.h +++ b/sakura_core/config/system_constants.h @@ -526,12 +526,18 @@ Version 168: �v���|�[�V���i���t�H���g + Version 169: + ���E���s�[�g������ 2014.01.08 Moca + + Version 170: + ini�ǂݎ���p�I�v�V���� 2014.12.08 Moca + -- �������ꂽ�̂Ō��ɖ߂��i1000�`1023���g�p�ς݁j 2008.11.16 nasukoji -- Version 1000: -- �o�[�W����1000�ȍ~��{�Ɠ����܂ł̊ԁA�g�킹�Ă��������B���Ȃ�p�ɂɍ\�����ύX�����Ǝv����̂ŁBby kobake 2008.03.02 */ -#define N_SHAREDATA_VERSION 168 +#define N_SHAREDATA_VERSION 170 #define STR_SHAREDATA_VERSION NUM_TO_STR(N_SHAREDATA_VERSION) #define GSTR_SHAREDATA (_T("SakuraShareData") _T(CON_SKR_MACHINE_SUFFIX_) _T(_CODE_SUFFIX_) _T(_DEBUG_SUFFIX_) _T(STR_SHAREDATA_VERSION)) diff --git a/sakura_core/debug/Debug2.cpp b/sakura_core/debug/Debug2.cpp index 5ec66f6e40..dd9985fd5e 100644 --- a/sakura_core/debug/Debug2.cpp +++ b/sakura_core/debug/Debug2.cpp @@ -25,6 +25,16 @@ void debug_exit() exit(1); } + +void debug_exit2(const char* file, int line, const char* exp) +{ + char szBuffer[1024]; + wsprintfA(szBuffer, "assert\n%s(%d):\n%s", file, line, exp); + MessageBoxA(NULL, szBuffer , "sakura", MB_OK); + exit(1); +} + + void warning_point() { int n; diff --git a/sakura_core/debug/Debug2.h b/sakura_core/debug/Debug2.h index e9d5779ed5..5b6fad6e93 100644 --- a/sakura_core/debug/Debug2.h +++ b/sakura_core/debug/Debug2.h @@ -36,13 +36,14 @@ #ifdef _DEBUG void debug_output(const char* str, ...); void debug_exit(); + void debug_exit2(const char* file, int line, const char* exp); void warning_point(); #define assert(exp) \ { \ if(!(exp)){ \ debug_output("!assert: %hs(%d): %hs\n", __FILE__, __LINE__, #exp); \ - debug_exit(); \ + debug_exit2(__FILE__, __LINE__, #exp); \ } \ } diff --git a/sakura_core/dlg/CDialog.cpp b/sakura_core/dlg/CDialog.cpp index 8a42f40508..e0224bd721 100644 --- a/sakura_core/dlg/CDialog.cpp +++ b/sakura_core/dlg/CDialog.cpp @@ -208,7 +208,7 @@ void CDialog::SetDialogPosSize() if( -1 != m_xPos && -1 != m_yPos ){ /* �E�B���h�E�ʒu�E�T�C�Y���Č� */ // 2014.11.28 �t�H���g�ύX�Ή� - if( m_nWidth == -1 ){ + if( m_nWidth == -1 && m_nHeight == -1 ){ RECT rc; ::GetWindowRect( m_hWnd, &rc ); m_nWidth = rc.right - rc.left; diff --git a/sakura_core/dlg/CDlgInput1.cpp b/sakura_core/dlg/CDlgInput1.cpp index 4891a83bd9..ac092432d1 100644 --- a/sakura_core/dlg/CDlgInput1.cpp +++ b/sakura_core/dlg/CDlgInput1.cpp @@ -95,7 +95,7 @@ BOOL CDlgInput1::DoModal( // m_pszText = pszText; /* �e�L�X�g */ m_cmemText.SetString( pszText ); bRet = (BOOL)::DialogBoxParam( - m_hInstance, + CSelectLang::getLangRsrcInstance(), MAKEINTRESOURCE( IDD_INPUT1 ), m_hwndParent, CDlgInput1Proc, diff --git a/sakura_core/dlg/CDlgProfileMgr.cpp b/sakura_core/dlg/CDlgProfileMgr.cpp index 3cf41c6824..ee98f68485 100644 --- a/sakura_core/dlg/CDlgProfileMgr.cpp +++ b/sakura_core/dlg/CDlgProfileMgr.cpp @@ -82,20 +82,16 @@ static std::tstring GetProfileMgrFileName(LPCTSTR profName = NULL) TCHAR szDir[_MAX_PATH]; SplitPath_FolderAndFile( pszPath, szDir, NULL ); - TCHAR szExePath[_MAX_PATH]; - TCHAR szDrive[_MAX_DRIVE]; - TCHAR szDir2[_MAX_DIR]; - TCHAR szFname[_MAX_FNAME]; - TCHAR szExt[_MAX_EXT]; - - ::GetModuleFileName( NULL, szExePath, _countof(szExePath) ); - _tsplitpath( szExePath, szDrive, szDir2, szFname, szExt ); TCHAR szIniFile[_MAX_PATH]; if( profName == NULL ){ - auto_snprintf_s( szIniFile, _MAX_PATH - 1, _T("%ts%ts%ts_prof%ts"), szDrive, szDir2, szFname, _T(".ini") ); + TCHAR szExePath[_MAX_PATH]; + TCHAR szFname[_MAX_FNAME]; + ::GetModuleFileName( NULL, szExePath, _countof(szExePath) ); + _tsplitpath( szExePath, NULL, NULL, szFname, NULL ); + auto_snprintf_s( szIniFile, _MAX_PATH - 1, _T("%ts\\%ts_prof%ts"), szDir, szFname, _T(".ini") ); }else{ - auto_snprintf_s( szIniFile, _MAX_PATH - 1, _T("%ts%ts%ts"), szDrive, szDir2, profName ); + auto_snprintf_s( szIniFile, _MAX_PATH - 1, _T("%ts\\%ts"), szDir, profName ); } return std::tstring(szIniFile); @@ -141,6 +137,8 @@ void CDlgProfileMgr::SetData( int nSelIndex ) nSelIndex = 0; } List_SetCurSel( hwndList, nSelIndex ); + DlgItem_Enable( GetHwnd(), IDC_BUTTON_PROF_DELETE, nSelIndex != 0 ); + DlgItem_Enable( GetHwnd(), IDC_BUTTON_PROF_RENAME, nSelIndex != 0 ); DlgItem_Enable( GetHwnd(), IDC_BUTTON_PROF_DEFCLEAR, settings.m_nDefaultIndex != -1 ); CheckDlgButtonBool( GetHwnd(), IDC_CHECK_PROF_DEFSTART, settings.m_bDefaultSelect ); @@ -322,7 +320,7 @@ void CDlgProfileMgr::CreateProf() std::tstring strTitle = LS(STR_DLGPROFILE_NEW_PROF_TITLE); std::tstring strMessage = LS(STR_DLGPROFILE_NEW_PROF_MSG); szText[0] = _T('\0'); - if( !cDlgInput1.DoModal(G_AppInstance(), GetHwnd(), strTitle.c_str(), strMessage.c_str(), max_size, szText) ){ + if( !cDlgInput1.DoModal(::GetModuleHandle(NULL), GetHwnd(), strTitle.c_str(), strMessage.c_str(), max_size, szText) ){ return; } if( szText[0] == _T('\0') ){ @@ -383,7 +381,7 @@ void CDlgProfileMgr::RenameProf() std::tstring strTitle = LS(STR_DLGPROFILE_RENAME_TITLE); std::tstring strMessage = LS(STR_DLGPROFILE_RENAME_MSG); int max_size = _MAX_PATH; - if( !cDlgInput1.DoModal(G_AppInstance(), GetHwnd(), strTitle.c_str(), strMessage.c_str(), max_size, szText) ){ + if( !cDlgInput1.DoModal(::GetModuleHandle(NULL), GetHwnd(), strTitle.c_str(), strMessage.c_str(), max_size, szText) ){ return; } if( szText[0] == _T('\0') ){ diff --git a/sakura_core/dlg/CDlgWinSize.cpp b/sakura_core/dlg/CDlgWinSize.cpp index 579c7c9650..4a1675a8b2 100644 --- a/sakura_core/dlg/CDlgWinSize.cpp +++ b/sakura_core/dlg/CDlgWinSize.cpp @@ -68,10 +68,10 @@ CDlgWinSize::~CDlgWinSize() 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] �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�� ) { m_eSaveWinSize = eSaveWinSize; diff --git a/sakura_core/doc/CDocFileOperation.cpp b/sakura_core/doc/CDocFileOperation.cpp index 22af15f764..bef2bd16af 100644 --- a/sakura_core/doc/CDocFileOperation.cpp +++ b/sakura_core/doc/CDocFileOperation.cpp @@ -81,7 +81,7 @@ void CDocFileOperation::DoFileUnlock() bool CDocFileOperation::OpenFileDialog( HWND hwndParent, //!< [in] const TCHAR* pszOpenFolder, //!< [in] NULL�ȊO���w�肷��Ə����t�H���_���w��ł��� - SLoadInfo* pLoadInfo, //!< [in/out] ���[�h��� + SLoadInfo* pLoadInfo, //!< [in,out] ���[�h��� std::vector& files ) { @@ -135,7 +135,7 @@ bool CDocFileOperation::DoLoadFlow(SLoadInfo* pLoadInfo) //! �t�@�C�����J�� bool CDocFileOperation::FileLoad( - SLoadInfo* pLoadInfo //!< [in/out] + SLoadInfo* pLoadInfo //!< [in,out] ) { bool bRet = DoLoadFlow(pLoadInfo); @@ -157,7 +157,7 @@ bool CDocFileOperation::FileLoad( //! �t�@�C�����J���i�������s�}�N�������s���Ȃ��j // 2009.08.11 ryoji FileLoad�ւ̃p�����[�^�lj��ɂ��Ă�������ANSI�łƐ������Ƃ�₷���̂œ��ʂ͕ʊ֐��ɂ��Ă��� bool CDocFileOperation::FileLoadWithoutAutoMacro( - SLoadInfo* pLoadInfo //!< [in/out] + SLoadInfo* pLoadInfo //!< [in,out] ) { return DoLoadFlow(pLoadInfo); diff --git a/sakura_core/doc/CDocFileOperation.h b/sakura_core/doc/CDocFileOperation.h index 887bb6abff..6062b66c05 100644 --- a/sakura_core/doc/CDocFileOperation.h +++ b/sakura_core/doc/CDocFileOperation.h @@ -42,17 +42,17 @@ class CDocFileOperation{ bool OpenFileDialog( HWND hwndParent, const TCHAR* pszOpenFolder, //!< [in] NULL�ȊO���w�肷��Ə����t�H���_���w��ł��� - SLoadInfo* pLoadInfo, //!< [in/out] ���[�h��� + SLoadInfo* pLoadInfo, //!< [in,out] ���[�h��� std::vector& files ); //���[�h�t���[ bool DoLoadFlow(SLoadInfo* pLoadInfo); bool FileLoad( - SLoadInfo* pLoadInfo //!< [in/out] + SLoadInfo* pLoadInfo //!< [in,out] ); bool FileLoadWithoutAutoMacro( - SLoadInfo* pLoadInfo //!< [in/out] + SLoadInfo* pLoadInfo //!< [in,out] ); void ReloadCurrentFile( //!< ����t�@�C���̍ăI�[�v�� Jul. 26, 2003 ryoji BOM�I�v�V�����lj� ECodeType nCharCode //!< [in] �����R�[�h��� diff --git a/sakura_core/doc/CDocOutline.cpp b/sakura_core/doc/CDocOutline.cpp index 198938c63e..6d4d3b82bb 100644 --- a/sakura_core/doc/CDocOutline.cpp +++ b/sakura_core/doc/CDocOutline.cpp @@ -311,7 +311,8 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri } //�擪���������o���L���̂����ꂩ�ł���΁A���֐i�� - wchar_t* pszText = NULL; + const wchar_t* pszText = NULL; + std::wstring strText; int j; for( j = 0; j < nCount; j++ ){ if( bRegex ){ @@ -330,9 +331,8 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri int nIndex = pRegex[j].GetIndex(); int nMatchLen = pRegex[j].GetMatchLen(); int nTextLen = pRegex[j].GetStringLen() - nLineLen + nMatchLen; - pszText = new wchar_t[nTextLen + 1]; - wmemcpy( pszText, pRegex[j].GetString() + nIndex, nTextLen ); - pszText[nTextLen] = L'\0'; + strText.assign( pRegex[j].GetString() + nIndex, nTextLen ); + pszText = strText.c_str(); wcscpy( szTitle, test[j].szGroupName ); break; } @@ -357,16 +357,16 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri //�s�����񂩂���s����菜�� pLine -> pszText // ���K�\���u���̂Ƃ��͐ݒ�ς� if( NULL == pszText ){ - pszText = new wchar_t[nLineLen + 1]; - wmemcpy( pszText, &pLine[i], nLineLen ); - pszText[nLineLen] = L'\0'; - bool bExtEol = GetDllShareData().m_Common.m_sEdit.m_bEnableExtEol; - for( i = 0; pszText[i] != L'\0'; ++i ){ + pszText = &pLine[i]; + nLineLen -= i; + const bool bExtEol = GetDllShareData().m_Common.m_sEdit.m_bEnableExtEol; + for( i = 0; i < nLineLen; ++i ){ if( WCODE::IsLineDelimiter(pszText[i], bExtEol) ){ - pszText[i] = L'\0'; break; } } + strText.assign( pszText, i ); + pszText = strText.c_str(); } /* @@ -383,8 +383,7 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri /* nDepth���v�Z */ int k; - BOOL bAppend; - bAppend = TRUE; + bool bAppend = true; for ( k = 0; k < nDepth; k++ ){ int nResult = wcscmp( pszStack[k], szTitle ); if ( nResult == 0 ){ @@ -396,7 +395,7 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri // �̂ŁA�������x���ɍ��킹��AppendData. nDepth = k; } - else if( nMaxStack> k ){ + else if( nMaxStack > k ){ // ���܂܂łɓ������o�������݂��Ȃ������B // Lv�������ꍇ�́A��v����܂ł����̂ڂ� for ( k = nDepth - 1; 0 <= k ; k-- ){ @@ -414,15 +413,13 @@ void CDocOutline::MakeFuncList_RuleFile( CFuncInfoArr* pcFuncInfoArr, std::tstri }else{ // 2002.11.03 Moca �ő�l�𒴂���ƃo�b�t�@�I�[�o�[�������邩��K������ // nDepth = nMaxStack; - bAppend = FALSE; + bAppend = false; } - - if( FALSE != bAppend ){ + + if( bAppend ){ pcFuncInfoArr->AppendData( nLineCount + CLogicInt(1), ptPos.GetY2() + CLayoutInt(1) , pszText, 0, nDepth ); nDepth++; } - delete [] pszText; - } delete [] pRegex; return; diff --git a/sakura_core/doc/CEditDoc.cpp b/sakura_core/doc/CEditDoc.cpp index b2c30a6e8f..c50c2d9a5d 100644 --- a/sakura_core/doc/CEditDoc.cpp +++ b/sakura_core/doc/CEditDoc.cpp @@ -685,9 +685,6 @@ void CEditDoc::OnChangeSetting( // �t�@�C�������”\�̃`�F�b�N���� bool bOld = m_cDocLocker.IsDocWritable(); m_cDocLocker.CheckWritable(bOld && !CAppMode::getInstance()->IsViewMode()); // �����‚���s�‚ɑJ�ڂ����Ƃ��������b�Z�[�W���o���i�o�߂���ƟT��������ˁH�j - if(bOld != m_cDocLocker.IsDocWritable()){ - pCEditWnd->UpdateCaption(); - } /* �t�@�C���̔r�����b�N */ if( m_cDocLocker.IsDocWritable() ){ @@ -842,6 +839,9 @@ void CEditDoc::OnChangeSetting( // �ݒ��߂� SelectCharWidthCache( CWM_FONT_PRINT, CWM_CACHE_LOCAL ); } + + // �e�E�B���h�E�̃^�C�g�����X�V + m_pcEditWnd->UpdateCaption(); } /*! �t�@�C����‚���Ƃ���MRU�o�^ & �ۑ��m�F �� �ۑ����s diff --git a/sakura_core/doc/layout/CLayoutMgr.cpp b/sakura_core/doc/layout/CLayoutMgr.cpp index b2de698ae2..f2388f2458 100644 --- a/sakura_core/doc/layout/CLayoutMgr.cpp +++ b/sakura_core/doc/layout/CLayoutMgr.cpp @@ -815,13 +815,17 @@ int CLayoutMgr::SearchWord( �����ʒu(�s������̃o�C�g���A�܂�Ԃ������s�ʒu) �����C�A�E�g�ʒu(�s������̕\�����ʒu�A�܂�Ԃ�����s�ʒu) + @param[in] ptLogic ���W�b�N�ʒu + @param[out] pptLayout ���C�A�E�g�ʒu + @param[in] nLineHint ���C�A�E�gY�l�̃q���g�B���߂�l�ɋ߂��l��n���ƍ����Ɍ����ł���B + @date 2004.06.16 Moca �C���f���g�\���̍ۂ�TAB���܂ލs�̍��W����C�� @date 2007.09.06 kobake �֐�����CaretPos_Phys2Log����LogicToLayout�ɕύX */ void CLayoutMgr::LogicToLayout( - const CLogicPoint& ptLogic, //!< [in] ���W�b�N�ʒu - CLayoutPoint* pptLayout, //!< [out] ���C�A�E�g�ʒu - CLayoutInt nLineHint //!< [in] ���C�A�E�gY�l�̃q���g�B���߂�l�ɋ߂��l��n���ƍ����Ɍ����ł���B + const CLogicPoint& ptLogic, + CLayoutPoint* pptLayout, + CLayoutInt nLineHint ) { pptLayout->Clear(); @@ -850,7 +854,7 @@ void CLayoutMgr::LogicToLayout( pptLayout->SetY( m_nLines ); return; } - + //���W�b�NY���ł�������ꍇ�́A��v����܂Ńf�N�������g ( while(pLayout->GetLogicLineNo() > ptLogic.GetY2()){ pLayout = pLayout->GetPrevLayout(); @@ -859,7 +863,7 @@ void CLayoutMgr::LogicToLayout( //���W�b�NY��������Offset���s���߂��Ă���ꍇ�͖߂� if(pLayout->GetLogicLineNo() == ptLogic.GetY2()){ - while( pLayout->GetPrevLayout() && pLayout->GetPrevLayout()->GetLogicLineNo() == ptLogic.GetY2() + while( pLayout && pLayout->GetPrevLayout() && pLayout->GetPrevLayout()->GetLogicLineNo() == ptLogic.GetY2() && ptLogic.x < pLayout->GetLogicOffset() ){ pLayout = pLayout->GetPrevLayout(); nCaretPosY--; @@ -869,7 +873,7 @@ void CLayoutMgr::LogicToLayout( // Layout���P�‚���ɐi�߂Ȃ���ptLogic.y�������s�Ɉ�v����Layout��T�� - do{ + while( pLayout ){ if( ptLogic.GetY2() == pLayout->GetLogicLineNo() ){ // 2013.05.10 Moca ������ const CLayout* pLayoutNext = pLayout->GetNextLayout(); @@ -945,7 +949,6 @@ void CLayoutMgr::LogicToLayout( nCaretPosY++; pLayout = pLayout->GetNextLayout(); } - while( pLayout ); // 2004.06.16 Moca �C���f���g�\���̍ۂ̈ʒu����C�� pptLayout->Set( diff --git a/sakura_core/doc/layout/CLayoutMgr.h b/sakura_core/doc/layout/CLayoutMgr.h index 2fcb347061..342e67305a 100644 --- a/sakura_core/doc/layout/CLayoutMgr.h +++ b/sakura_core/doc/layout/CLayoutMgr.h @@ -57,7 +57,7 @@ enum EKinsokuType { struct LayoutReplaceArg { CLayoutRange sDelRange; //!< [in]�폜�͈́B���C�A�E�g�P�ʁB COpeLineData* pcmemDeleted; //!< [out]�폜���ꂽ�f�[�^ - COpeLineData* pInsData; //!< [in/out]�}������f�[�^ + COpeLineData* pInsData; //!< [in,out]�}������f�[�^ CLayoutInt nAddLineNum; //!< [out] �ĕ`��q���g ���C�A�E�g�s�̑��� CLayoutInt nModLineFrom; //!< [out] �ĕ`��q���g �ύX���ꂽ���C�A�E�g�sFrom(���C�A�E�g�s�̑�����0�̂Ƃ��g��) CLayoutInt nModLineTo; //!< [out] �ĕ`��q���g �ύX���ꂽ���C�A�E�g�sTo(���C�A�E�g�s�̑�����0�̂Ƃ��g��) diff --git a/sakura_core/doc/logic/CDocLineMgr.h b/sakura_core/doc/logic/CDocLineMgr.h index 21e62d61d2..19cc5fc5a9 100644 --- a/sakura_core/doc/logic/CDocLineMgr.h +++ b/sakura_core/doc/logic/CDocLineMgr.h @@ -32,7 +32,7 @@ class CBregexp; // 2002/2/10 aroka struct DocLineReplaceArg { CLogicRange sDelRange; //!< [in] �폜�͈́B���W�b�N�P�ʁB COpeLineData* pcmemDeleted; //!< [out] �폜���ꂽ�f�[�^��ۑ� - COpeLineData* pInsData; //!< [in/out] �}������f�[�^(���g���ړ�����) + COpeLineData* pInsData; //!< [in,out] �}������f�[�^(���g���ړ�����) CLogicInt nDeletedLineNum; //!< [out] �폜�����s�̑��� CLogicInt nInsLineNum; //!< [out] �}���ɂ���đ������s�̐� CLogicPoint ptNewPos; //!< [out] �}�����ꂽ�����̎��̈ʒu diff --git a/sakura_core/docplus/CBookmarkManager.cpp b/sakura_core/docplus/CBookmarkManager.cpp index 5759a91282..437aa3f8d6 100644 --- a/sakura_core/docplus/CBookmarkManager.cpp +++ b/sakura_core/docplus/CBookmarkManager.cpp @@ -28,15 +28,15 @@ void CBookmarkManager::ResetAllBookMark( void ) @date 2001.12.03 hor */ bool CBookmarkManager::SearchBookMark( - CLogicInt nLineNum, /* �����J�n�s */ - ESearchDirection bPrevOrNext, /* 0==�O������ 1==������� */ - CLogicInt* pnLineNum /* �}�b�`�s */ + CLogicInt nLineNum, //!< �����J�n�s + ESearchDirection bPrevOrNext, //!< �������� + CLogicInt* pnLineNum //!< �}�b�`�s ) { CDocLine* pDocLine; CLogicInt nLinePos=nLineNum; - //�O������ + // ������� if( bPrevOrNext == SEARCH_BACKWARD ){ nLinePos--; pDocLine = m_pcDocLineMgr->GetLine( nLinePos ); @@ -49,7 +49,7 @@ bool CBookmarkManager::SearchBookMark( pDocLine = pDocLine->GetPrevLine(); } } - //������� + // �O������ else{ nLinePos++; pDocLine = m_pcDocLineMgr->GetLine( nLinePos ); diff --git a/sakura_core/docplus/CDiffManager.cpp b/sakura_core/docplus/CDiffManager.cpp index 1d47b36ae0..0df42727ff 100644 --- a/sakura_core/docplus/CDiffManager.cpp +++ b/sakura_core/docplus/CDiffManager.cpp @@ -135,13 +135,13 @@ void CDiffLineMgr::ResetAllDiffMark() */ bool CDiffLineMgr::SearchDiffMark( CLogicInt nLineNum, //!< �����J�n�s - ESearchDirection bPrevOrNext, //!< 0==�O������ 1==������� + ESearchDirection bPrevOrNext, //!< �������� CLogicInt* pnLineNum //!< �}�b�`�s ) { CLogicInt nLinePos = nLineNum; - //�O������ + // ������� if( bPrevOrNext == SEARCH_BACKWARD ) { nLinePos--; @@ -157,7 +157,7 @@ bool CDiffLineMgr::SearchDiffMark( pDocLine = pDocLine->GetPrevLine(); } } - //������� + // �O������ else { nLinePos++; diff --git a/sakura_core/docplus/CFuncListManager.cpp b/sakura_core/docplus/CFuncListManager.cpp index cbfa063698..a86a47880c 100644 --- a/sakura_core/docplus/CFuncListManager.cpp +++ b/sakura_core/docplus/CFuncListManager.cpp @@ -48,7 +48,7 @@ void CFuncListManager::SetLineFuncList(CDocLine* pcDocLine, bool bFlag) bool CFuncListManager::SearchFuncListMark( const CDocLineMgr* pcDocLineMgr, CLogicInt nLineNum, //!< �����J�n�s - ESearchDirection bPrevOrNext, + ESearchDirection bPrevOrNext, //!< �������� CLogicInt* pnLineNum //!< �}�b�`�s ) const { diff --git a/sakura_core/env/CDocTypeManager.cpp b/sakura_core/env/CDocTypeManager.cpp index 1b7c0d0b00..cb9027d3d0 100644 --- a/sakura_core/env/CDocTypeManager.cpp +++ b/sakura_core/env/CDocTypeManager.cpp @@ -128,6 +128,13 @@ bool CDocTypeManager::SetTypeConfig(CTypeConfig cDocumentType, const STypeConfig return false; } +/*! �^�C�v�ʐݒ�(mini)�擾 + @param cDocumentType [in] �h�L�������g�^�C�v + @param type [out] �^�C�v�ʐݒ�(mini) + + @retval true ���� + @retval false �ُ� +*/ bool CDocTypeManager::GetTypeConfigMini(CTypeConfig cDocumentType, const STypeConfigMini** type) { int n = cDocumentType.GetIndex(); diff --git a/sakura_core/env/CFileNameManager.cpp b/sakura_core/env/CFileNameManager.cpp index b2876638f1..6ffd32241e 100644 --- a/sakura_core/env/CFileNameManager.cpp +++ b/sakura_core/env/CFileNameManager.cpp @@ -551,7 +551,7 @@ void CFileNameManager::GetIniFileNameDirect( LPTSTR pszPrivateIniFile, LPTSTR ps if( pszProfName[0] == '\0' ){ auto_snprintf_s( pszPrivateIniFile, _MAX_PATH - 1, _T("%ts\\%ts\\%ts%ts"), szPath, szDir, szFname, _T(".ini") ); }else{ - auto_snprintf_s( pszPrivateIniFile, _MAX_PATH - 1, _T("%ts\\%ts\\%ts\\%ts%ts"), szPath, szDir, szFname, pszProfName, _T(".ini") ); + auto_snprintf_s( pszPrivateIniFile, _MAX_PATH - 1, _T("%ts\\%ts\\%ts\\%ts%ts"), szPath, szDir, pszProfName, szFname, _T(".ini") ); } } } diff --git a/sakura_core/env/CShareData.cpp b/sakura_core/env/CShareData.cpp index f0ef1fe287..d4b1dddfb7 100644 --- a/sakura_core/env/CShareData.cpp +++ b/sakura_core/env/CShareData.cpp @@ -235,6 +235,7 @@ bool CShareData::InitShareData() sGeneral.m_bCloseAllConfirm = FALSE; /* [���ׂĕ‚���]�ő��ɕҏW�p�̃E�B���h�E������Ίm�F���� */ // 2006.12.25 ryoji sGeneral.m_bExitConfirm = FALSE; /* �I�����̊m�F������ */ sGeneral.m_nRepeatedScrollLineNum = CLayoutInt(3); /* �L�[���s�[�g���̃X�N���[���s�� */ + sGeneral.m_nRepeatedMoveCaretNum = 2; // �L�[���s�[�g���̍��E�ړ��� sGeneral.m_nRepeatedScroll_Smooth = FALSE; /* �L�[���s�[�g���̃X�N���[�������炩�ɂ��邩 */ sGeneral.m_nPageScrollByWheel = 0; /* �L�[/�}�E�X�{�^�� + �z�C�[���X�N���[���Ńy�[�W�X�N���[������ */ // 2009.01.17 nasukoji sGeneral.m_nHorizontalScrollByWheel = 0; /* �L�[/�}�E�X�{�^�� + �z�C�[���X�N���[���ʼn��X�N���[������ */ // 2009.01.17 nasukoji @@ -618,6 +619,8 @@ bool CShareData::InitShareData() ::SetRect( &sOthers.m_rcDiffDialog, 0, 0, 0, 0 ); ::SetRect( &sOthers.m_rcFavoriteDialog, 0, 0, 0, 0 ); ::SetRect( &sOthers.m_rcTagJumpDialog, 0, 0, 0, 0 ); + + sOthers.m_bIniReadOnly = false; } // [�X�e�[�^�X�o�[]�^�u diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index cfca81bf07..5240c79d25 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -151,7 +151,10 @@ bool CShareData_IO::ShareData_IO_2( bool bRead ) pcMenuDrawer = NULL; if( !bRead ){ - cProfile.WriteProfile( szIniFileName, LTEXT(" sakura.ini �e�L�X�g�G�f�B�^�ݒ�t�@�C��") ); + // 2014.12.08 sakura.ini�̓ǂݎ���p + if( !GetDllShareData().m_Common.m_sOthers.m_bIniReadOnly ){ + cProfile.WriteProfile( szIniFileName, LTEXT(" sakura.ini �e�L�X�g�G�f�B�^�ݒ�t�@�C��") ); + } } // MYTRACE( _T("Ini�t�@�C������ 8 ���v����(�~���b) = %d\n"), cRunningTimer.Read() ); @@ -459,6 +462,7 @@ void CShareData_IO::ShareData_IO_Common( CDataProfile& cProfile ) cProfile.IOProfileData( pszSecName, LTEXT("szOpenDialogSelDir") , StringBufferT(common.m_sEdit.m_OpenDialogSelDir,_countof2(common.m_sEdit.m_OpenDialogSelDir)) ); cProfile.IOProfileData( pszSecName, LTEXT("bBoxSelectLock") , common.m_sEdit.m_bBoxSelectLock ); cProfile.IOProfileData( pszSecName, LTEXT("nRepeatedScrollLineNum") , common.m_sGeneral.m_nRepeatedScrollLineNum ); + cProfile.IOProfileData( pszSecName, LTEXT("nRepeatedMoveCaretNum") , common.m_sGeneral.m_nRepeatedMoveCaretNum ); cProfile.IOProfileData( pszSecName, LTEXT("nRepeatedScroll_Smooth") , common.m_sGeneral.m_nRepeatedScroll_Smooth ); cProfile.IOProfileData( pszSecName, LTEXT("nPageScrollByWheel") , common.m_sGeneral.m_nPageScrollByWheel ); // 2009.01.17 nasukoji cProfile.IOProfileData( pszSecName, LTEXT("nHorizontalScrollByWheel") , common.m_sGeneral.m_nHorizontalScrollByWheel ); // 2009.01.17 nasukoji @@ -2293,6 +2297,7 @@ void CShareData_IO::ShareData_IO_Other( CDataProfile& cProfile ) nStructureVersion = int(pShare->m_vStructureVersion); cProfile.IOProfileData( pszSecName, LTEXT("vStructureVersion"), nStructureVersion ); } + cProfile.IOProfileData( pszSecName, L"bIniReadOnly", pShare->m_Common.m_sOthers.m_bIniReadOnly ); } /*! diff --git a/sakura_core/env/CommonSetting.h b/sakura_core/env/CommonSetting.h index 0f2e46b4f9..f0d89dffa9 100644 --- a/sakura_core/env/CommonSetting.h +++ b/sakura_core/env/CommonSetting.h @@ -70,6 +70,7 @@ struct CommonSetting_General //�X�N���[�� CLayoutInt m_nRepeatedScrollLineNum; //!< �L�[���s�[�g���̃X�N���[���s�� + int m_nRepeatedMoveCaretNum; //!< �L�[���s�[�g���̍��E�ړ��� BOOL m_nRepeatedScroll_Smooth; //!< �L�[���s�[�g���̃X�N���[�������炩�ɂ��邩 int m_nPageScrollByWheel; //!< �L�[/�}�E�X�{�^�� + �z�C�[���X�N���[���Ńy�[�WUP/DOWN���� // 2009.01.17 nasukoji int m_nHorizontalScrollByWheel; //!< �L�[/�}�E�X�{�^�� + �z�C�[���X�N���[���ʼn��X�N���[������ // 2009.01.17 nasukoji @@ -635,6 +636,8 @@ struct CommonSetting_Others RECT m_rcDiffDialog; //!< �uDIFF�����\���v�_�C�A���O�{�b�N�X�̃T�C�Y�ƈʒu RECT m_rcFavoriteDialog; //!< �u�����Ƃ��C�ɓ���̊Ǘ��v�_�C�A���O�{�b�N�X�̃T�C�Y�ƈʒu RECT m_rcTagJumpDialog; //!< �u�_�C���N�g�^�O�W�����v���ꗗ�v�_�C�A���O�{�b�N�X�̃T�C�Y�ƈʒu + + bool m_bIniReadOnly; //!< sakura.ini�̓ǂݎ���p }; // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/sakura_core/extmodule/CBregexpDll2.cpp b/sakura_core/extmodule/CBregexpDll2.cpp index 557ad98ce8..620fa68a32 100644 --- a/sakura_core/extmodule/CBregexpDll2.cpp +++ b/sakura_core/extmodule/CBregexpDll2.cpp @@ -1,3 +1,26 @@ +/* + Copyright (C) 2008, kobake + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; + you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment + in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, + and must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. +*/ #include "StdAfx.h" #include "CBregexpDll2.h" @@ -27,8 +50,8 @@ LPCTSTR CBregexpDll2::GetDllNameImp( int index ) �֐��̃A�h���X���擾���ă����o�ɕۊǂ���D - @retval 0 ���� - @retval 1 �A�h���X�擾�Ɏ��s + @retval true ���� + @retval false �A�h���X�擾�Ɏ��s */ bool CBregexpDll2::InitDllImp() { diff --git a/sakura_core/extmodule/CMigemo.cpp b/sakura_core/extmodule/CMigemo.cpp index 00c3d61856..4bdf6712c5 100644 --- a/sakura_core/extmodule/CMigemo.cpp +++ b/sakura_core/extmodule/CMigemo.cpp @@ -73,6 +73,9 @@ bool CMigemo::InitDllImp() m_migemo_load_s = (Proc_migemo_load_s) m_migemo_load; m_migemo_is_enable_s = (Proc_migemo_is_enable_s) m_migemo_is_enable; + // IA64/x64�͑Ή��s�v +#ifdef _WIN64 +#else // ver 1.3 �ȍ~�� stdcall DWORD dwVersionMS, dwVersionLS; GetAppVersionInfo( GetInstance(), VS_VERSION_INFO, &dwVersionMS, &dwVersionLS ); @@ -83,6 +86,7 @@ bool CMigemo::InitDllImp() }else{ m_bStdcall = false; } +#endif m_bUtf8 = false; @@ -92,10 +96,11 @@ bool CMigemo::InitDllImp() return true; } -int CMigemo::DeInitDll(void) +bool CMigemo::DeinitDllImp(void) { migemo_close(); - return 0; + + return true; } LPCTSTR CMigemo::GetDllNameImp(int nIndex) @@ -133,7 +138,7 @@ long CMigemo::migemo_open(char* dict) }else{ m_migemo = (*m_migemo_open)(NULL); } - + if (m_migemo == NULL) return 0; @@ -334,6 +339,7 @@ int CMigemo::migemo_load_all() CMigemo::~CMigemo() { + DeinitDll(); } int __cdecl pcre_char2int_sjis(const unsigned char* in, unsigned int* out) diff --git a/sakura_core/extmodule/CMigemo.h b/sakura_core/extmodule/CMigemo.h index d67e22cfb1..01b2fceaba 100644 --- a/sakura_core/extmodule/CMigemo.h +++ b/sakura_core/extmodule/CMigemo.h @@ -108,13 +108,18 @@ class CMigemo : public TSingleton, public CDllImp { Proc_migemo_is_enable_s m_migemo_is_enable_s; migemo* m_migemo; + // IA64/x64�͑Ή��s�v +#ifdef _WIN64 + static const bool m_bStdcall = true; +#else bool m_bStdcall; +#endif bool m_bUtf8; - + LPCTSTR GetDllNameImp(int nIndex); bool InitDllImp(); - int DeInitDll(void); - + bool DeinitDllImp(void); + public: long migemo_open(char* dict); void migemo_close(); diff --git a/sakura_core/macro/CMacro.cpp b/sakura_core/macro/CMacro.cpp index a09351695e..9e6ea8daf7 100644 --- a/sakura_core/macro/CMacro.cpp +++ b/sakura_core/macro/CMacro.cpp @@ -1770,7 +1770,9 @@ bool CMacro::HandleFunction(CEditView *View, EFunctionCode ID, const VARIANT *Ar } TCHAR *Buffer = new TCHAR[ nMaxLen+1 ]; - _tcscpy( Buffer, sDefaultValue.c_str() ); + size_t nLen = t_min( sDefaultValue.length(), (size_t)nMaxLen); + auto_memcpy( Buffer, sDefaultValue.c_str(), nLen ); + Buffer[nLen] = _T('\0'); CDlgInput1 cDlgInput1; if( cDlgInput1.DoModal( G_AppInstance(), View->GetHwnd(), _T("sakura macro"), sMessage.c_str(), nMaxLen, Buffer ) ) { SysString S( Buffer, _tcslen(Buffer) ); diff --git a/sakura_core/macro/CPPA.cpp b/sakura_core/macro/CPPA.cpp index be4e0d8ad7..387f9c5090 100644 --- a/sakura_core/macro/CPPA.cpp +++ b/sakura_core/macro/CPPA.cpp @@ -103,8 +103,8 @@ LPCTSTR CPPA::GetDllNameImp(int nIndex) �֐��̃A�h���X���擾���ă����o�ɕۊǂ���D - @retval 0 ���� - @retval 1 �A�h���X�擾�Ɏ��s + @retval true ���� + @retval false �A�h���X�擾�Ɏ��s */ bool CPPA::InitDllImp() { diff --git a/sakura_core/outline/CDlgFuncList.cpp b/sakura_core/outline/CDlgFuncList.cpp index 2403c28621..f7d47fbd77 100644 --- a/sakura_core/outline/CDlgFuncList.cpp +++ b/sakura_core/outline/CDlgFuncList.cpp @@ -872,7 +872,8 @@ int CDlgFuncList::GetData( void ) } /* Java/C++���\�b�h�c���[�̍ő�l�X�g�[�� */ -#define MAX_JAVA_TREE_NEST 16 +// 2016.03.06 vector����16 -> 32 �܂ő��₵�Ă��� +#define MAX_JAVA_TREE_NEST 32 /*! �c���[�R���g���[���̏������FJava���\�b�h�c���[ @@ -892,7 +893,6 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) CLayoutInt nFuncColTop(INT_MAX); TV_INSERTSTRUCT tvis; const TCHAR* pPos; - TCHAR szLabel[64+6]; // Jan. 07, 2001 genta �N���X���G���A�̊g�� HTREEITEM htiGlobal = NULL; // Jan. 04, 2001 genta C++�Ɠ��� HTREEITEM htiClass; HTREEITEM htiItem; @@ -901,7 +901,7 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) TV_ITEM tvi; int nClassNest; int nDummylParam = -64000; // 2002.11.10 Moca �N���X���̃_�~�[lParam �\�[�g�̂��� - TCHAR szClassArr[MAX_JAVA_TREE_NEST][64]; // Jan. 04, 2001 genta �N���X���G���A�̊g�� //2009.9.21 syat �l�X�g���[������ۂ�BOF�΍� + std::vector vStrClasses; ::EnableWindow( ::GetDlgItem( GetHwnd() , IDC_BUTTON_COPY ), TRUE ); @@ -927,7 +927,7 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) m_pcFuncInfoArr->SetAppendText( FL_OBJ_NAMESPACE, LSW(STR_DLGFNCLST_APND_NAMESPACE), false ); m_pcFuncInfoArr->SetAppendText( FL_OBJ_INTERFACE, LSW(STR_DLGFNCLST_APND_INTERFACE), false ); m_pcFuncInfoArr->SetAppendText( FL_OBJ_GLOBAL, LSW(STR_DLGFNCLST_APND_GLOBAL), false ); - + nFuncLineOld = CLayoutInt(-1); nFuncColOld = CLayoutInt(-1); bSelected = FALSE; @@ -936,6 +936,7 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) const TCHAR* pWork; pWork = pcFuncInfo->m_cmemFuncName.GetStringPtr(); int m = 0; + vStrClasses.clear(); nClassNest = 0; /* �N���X��::���\�b�h�̏ꍇ */ if( NULL != ( pPos = _tcsstr( pWork, _T("::") ) ) @@ -952,14 +953,13 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) k = nWorkLen; break; } - // 2005-09-02 D.S.Koba GetSizeOfChar nCharChars = CNativeT::GetSizeOfChar( pWork, nWorkLen, k ); if( 1 == nCharChars && 0 == nNestTemplate && _T(':') == pWork[k] ){ // Jan. 04, 2001 genta // C++�̓����̂��߁A\�ɉ�����::���N���X��؂�Ƃ݂Ȃ��悤�� if( k < nWorkLen - 1 && _T(':') == pWork[k+1] ){ - auto_memcpy( szClassArr[nClassNest], &pWork[m], k - m ); - szClassArr[nClassNest][k - m] = _T('\0'); + std::tstring strClass(&pWork[m], k - m); + vStrClasses.push_back(strClass); ++nClassNest; m = k + 2; ++k; @@ -972,8 +972,8 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) break; } else if( 1 == nCharChars && _T('\\') == pWork[k] ){ - auto_memcpy( szClassArr[nClassNest], &pWork[m], k - m ); - szClassArr[nClassNest][k - m] = _T('\0'); + std::tstring strClass(&pWork[m], k - m); + vStrClasses.push_back(strClass); ++nClassNest; m = k + 1; } @@ -1011,30 +1011,23 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) // �ƂȂ��Ă���Ƃ݂Ȃ��AszClassArr[k] �� �u�N���X���v�ƈ�v����΁A�����e�m�[�h�ɐݒ�B // �������A��v���鍀�ڂ���������ꍇ�͍ŏ��̍��ڂ�e�m�[�h�ɂ���B // ��v���Ȃ��ꍇ�́u(�N���X��)(���p�X�y�[�X���)�N���X�v�̃m�[�h���쐬����B - size_t nClassNameLen = _tcslen( szClassArr[k] ); + size_t nClassNameLen = vStrClasses[k].size(); for( ; NULL != htiClass ; htiClass = TreeView_GetNextSibling( hwndTree, htiClass )) { tvi.mask = TVIF_HANDLE | TVIF_TEXT; tvi.hItem = htiClass; - tvi.pszText = szLabel; - tvi.cchTextMax = _countof(szLabel); - if( TreeView_GetItem( hwndTree, &tvi ) ) - { - if( 0 == _tcsncmp( szClassArr[k],szLabel,nClassNameLen) ) - { - if( _countof(szLabel) < (nClassNameLen +1) ) - break;// �o�b�t�@�s���ł͖������Ƀ}�b�`���� - else - { - if(bAddClass) - { - if(szLabel[nClassNameLen]==L' ') - break; + + std::vector vecStr; + if( TreeView_GetItemTextVector(hwndTree, tvi, vecStr) ){ + const TCHAR* pszLabel = &vecStr[0]; + if( 0 == _tcsncmp(vStrClasses[k].c_str(), pszLabel, nClassNameLen) ){ + if( bAddClass ){ + if( pszLabel[nClassNameLen]==L' ' ){ + break; } - else - { - if(szLabel[nClassNameLen]==L'\0') - break; + }else{ + if( pszLabel[nClassNameLen]==L'\0' ){ + break; } } } @@ -1044,22 +1037,20 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) /* �N���X���̃A�C�e�����o�^����Ă��Ȃ��̂œo�^ */ if( NULL == htiClass ){ // 2002/10/28 frozen �ォ�炱���ֈړ� - TCHAR* pClassName; - pClassName = new TCHAR[ _tcslen( szClassArr[k] ) + 1 + m_pcFuncInfoArr->AppendTextLenMax() ]; // 2002/10/28 frozen +9�͒lj����镶����̍ő咷�i" ���O���"���ő�j// 2011.09.25 syat �v���O�C���ɂ��g���Ή� - _tcscpy( pClassName, szClassArr[k] ); - + std::tstring strClassName = vStrClasses[k]; + tvis.item.lParam = -1; if( bAddClass ) { if( pcFuncInfo->m_nInfo == FL_OBJ_NAMESPACE ) { //_tcscat( pClassName, _T(" ���O���") ); - _tcscat( pClassName, to_tchar(m_pcFuncInfoArr->GetAppendText( FL_OBJ_NAMESPACE ).c_str()) ); + strClassName += to_tchar(m_pcFuncInfoArr->GetAppendText(FL_OBJ_NAMESPACE).c_str()); tvis.item.lParam = i; } else //_tcscat( pClassName, _T(" �N���X") ); - _tcscat( pClassName, to_tchar(m_pcFuncInfoArr->GetAppendText( FL_OBJ_CLASS ).c_str()) ); + strClassName += to_tchar(m_pcFuncInfoArr->GetAppendText(FL_OBJ_CLASS).c_str()); tvis.item.lParam = nDummylParam; nDummylParam++; } @@ -1067,13 +1058,9 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) tvis.hParent = htiParent; tvis.hInsertAfter = TVI_LAST; tvis.item.mask = TVIF_TEXT | TVIF_PARAM; - tvis.item.pszText = const_cast(to_tchar(pClassName)); + tvis.item.pszText = const_cast(strClassName.c_str()); htiClass = TreeView_InsertItem( hwndTree, &tvis ); - // Jan. 04, 2001 genta - // �s�v�ɂȂ����炳�����ƍ폜 - delete [] pClassName; // 2002/10/28 frozen �����炱���ֈړ� - }else{ //none } @@ -1113,9 +1100,7 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) htiClass = htiGlobal; } } - TCHAR* pFuncName; - pFuncName = new TCHAR[ _tcslen(pWork) + m_pcFuncInfoArr->AppendTextLenMax() ]; // ���Œlj����镶���񂪎��܂邾���m�� - _tcscpy( pFuncName, pWork ); + std::tstring strFuncName = pWork; // 2002/10/27 frozen �lj�������̎�ނ𑝂₵�� switch(pcFuncInfo->m_nInfo) @@ -1125,17 +1110,16 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass ) case FL_OBJ_GLOBAL: //�u�O���[�o���v�͕ʂ̏ꏊ�ŏ������Ă�̂ŏ��O break; default: - _tcscat( pFuncName, to_tchar(m_pcFuncInfoArr->GetAppendText( pcFuncInfo->m_nInfo ).c_str()) ); + strFuncName += to_tchar(m_pcFuncInfoArr->GetAppendText(pcFuncInfo->m_nInfo).c_str()); } /* �Y���N���X���̃A�C�e���̎q�Ƃ��āA���\�b�h�̃A�C�e����o�^ */ tvis.hParent = htiClass; tvis.hInsertAfter = TVI_LAST; tvis.item.mask = TVIF_TEXT | TVIF_PARAM; - tvis.item.pszText = pFuncName; + tvis.item.pszText = const_cast(strFuncName.c_str()); tvis.item.lParam = i; htiItem = TreeView_InsertItem( hwndTree, &tvis ); - delete [] pFuncName; /* �N���b�v�{�[�h�ɃR�s�[����e�L�X�g��ҏW */ WCHAR szText[2048]; @@ -3237,14 +3221,15 @@ void CDlgFuncList::DoMenu( POINT pt, HWND hwndFrom ) CDocTypeManager().GetTypeConfig( CTypeConfig(m_nDocType), m_type ); EDockSide eDockSide = ProfDockSide(); // �ݒ��̔z�u UINT uFlags = MF_BYPOSITION | MF_STRING; + const bool bDropDown = (hwndFrom == GetHwnd()); // true=�h���b�v�_�E��, false=�E�N���b�N HMENU hMenu = ::CreatePopupMenu(); - HMENU hMenuSub = ::CreatePopupMenu(); + HMENU hMenuSub = bDropDown ? NULL : ::CreatePopupMenu(); int iPos = 0; int iPosSub = 0; - HMENU& hMenuRef = ( hwndFrom == GetHwnd() )? hMenu: hMenuSub; - int& iPosRef = ( hwndFrom == GetHwnd() )? iPos: iPosSub; + HMENU& hMenuRef = bDropDown ? hMenu : hMenuSub; + int& iPosRef = bDropDown ? iPos : iPosSub; - if( hwndFrom != GetHwnd() ){ + if( bDropDown == false ){ // �����A������ hwndFrom �ɉ������󋵈ˑ����j���[��lj�����Ƃ������� // �i�c���[�Ȃ�u���ׂēW�J�v�^�u���ׂďk���v�Ƃ��A���������́j ::InsertMenu( hMenu, iPos++, MF_BYPOSITION | MF_STRING, 450, LS(STR_DLGFNCLST_MENU_UPDATE) ); @@ -3281,7 +3266,7 @@ void CDlgFuncList::DoMenu( POINT pt, HWND hwndFrom ) ::InsertMenu( hMenuRef, iPosRef++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL ); ::InsertMenu( hMenuRef, iPosRef++, MF_BYPOSITION | MF_STRING, 305, LS(STR_DLGFNCLST_MENU_UNIFY) ); - if( hwndFrom != GetHwnd() ){ + if( bDropDown == false ){ ::InsertMenu( hMenu, iPos++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL ); ::InsertMenu( hMenu, iPos++, MF_BYPOSITION | MF_STRING, 452, LS(STR_DLGFNCLST_MENU_CLOSE) ); } diff --git a/sakura_core/parse/CWordParse.cpp b/sakura_core/parse/CWordParse.cpp index 626110ae61..7248a3feee 100644 --- a/sakura_core/parse/CWordParse.cpp +++ b/sakura_core/parse/CWordParse.cpp @@ -94,7 +94,7 @@ inline bool isCSymbol(wchar_t c) // (c>=L'0' && c<=L'9') || // (c>=L'A' && c<=L'Z') || // (c>=L'a' && c<=L'z'); - return (c<128 && gm_keyword_char[c]==CK_CSYM); + return (c<_countof(gm_keyword_char) && gm_keyword_char[c]==CK_CSYM); } //! �S�p�ŁA���ʎq�Ɏg�p�”\�ȕ������ǂ��� @@ -126,7 +126,7 @@ ECharKind CWordParse::WhatKindOfChar( wchar_t c=pData[nIdx]; //���܂ł̔��p - if( c<128 ) return (ECharKind)gm_keyword_char[c]; + if( c<_countof(gm_keyword_char) ) return (ECharKind)gm_keyword_char[c]; //if( c == CR )return CK_CR; //if( c == LF )return CK_LF; //if( c == TAB )return CK_TAB; // �^�u @@ -435,7 +435,9 @@ BOOL IsURL( return IsMailAddress(pszLine, nLineLen, pnMatchLen); } -/* ���݈ʒu�����[���A�h���X�Ȃ�΁ANULL�ȊO�ƁA���̒�����Ԃ� */ +/* ���݈ʒu�����[���A�h���X�Ȃ�΁ANULL�ȊO�ƁA���̒�����Ԃ� + @date 2016.04.27 �L���ނ����� +*/ BOOL IsMailAddress( const wchar_t* pszBuf, int nBufLen, int* pnAddressLenfth ) { int j; @@ -447,6 +449,7 @@ BOOL IsMailAddress( const wchar_t* pszBuf, int nBufLen, int* pnAddressLenfth ) if( (pszBuf[j] >= L'a' && pszBuf[j] <= L'z') || (pszBuf[j] >= L'A' && pszBuf[j] <= L'Z') || (pszBuf[j] >= L'0' && pszBuf[j] <= L'9') + || NULL != wcschr(L"!#$%&'*+-/=?^_`{|}~", pszBuf[j]) ){ j++; }else{ @@ -458,8 +461,7 @@ BOOL IsMailAddress( const wchar_t* pszBuf, int nBufLen, int* pnAddressLenfth ) || (pszBuf[j] >= L'A' && pszBuf[j] <= L'Z') || (pszBuf[j] >= L'0' && pszBuf[j] <= L'9') || (pszBuf[j] == L'.') - || (pszBuf[j] == L'-') - || (pszBuf[j] == L'_') + || NULL != wcschr(L"!#$%&'*+-/=?^_`{|}~", pszBuf[j]) ) ){ j++; diff --git a/sakura_core/prop/CPropComEdit.cpp b/sakura_core/prop/CPropComEdit.cpp index aa9c5906dc..e72cecf52f 100644 --- a/sakura_core/prop/CPropComEdit.cpp +++ b/sakura_core/prop/CPropComEdit.cpp @@ -205,7 +205,7 @@ void CPropEdit::SetData( HWND hwndDlg ) CheckDlgButtonBool( hwndDlg, IDC_CHECK_bOverWriteFixMode, m_Common.m_sEdit.m_bOverWriteFixMode ); // ��`���͂őI��͈͂��폜���� - CheckDlgButtonBool( hwndDlg, IDC_CHECK_bOverWriteBoxDelete, m_Common.m_sEdit.m_bOverWriteFixMode ); + CheckDlgButtonBool( hwndDlg, IDC_CHECK_bOverWriteBoxDelete, m_Common.m_sEdit.m_bOverWriteBoxDelete ); // URL���N���b�N���ꂽ��I�����邩 */ // 2007.02.11 genta ���̃y�[�W�ֈړ� ::CheckDlgButton( hwndDlg, IDC_CHECK_bSelectClickedURL, m_Common.m_sEdit.m_bSelectClickedURL ); diff --git a/sakura_core/prop/CPropComMacro.cpp b/sakura_core/prop/CPropComMacro.cpp index 09729c1fb5..f61f46b120 100644 --- a/sakura_core/prop/CPropComMacro.cpp +++ b/sakura_core/prop/CPropComMacro.cpp @@ -370,7 +370,7 @@ void CPropMacro::InitDialog( HWND hwndDlg ) { struct ColumnData_CPropMacro_Init ColumnList[] = { { STR_PROPCOMMACR_LIST1, 40 }, - { STR_PROPCOMMACR_LIST2, 150 }, + { STR_PROPCOMMACR_LIST2, 200 }, { STR_PROPCOMMACR_LIST3, 150 }, { STR_PROPCOMMACR_LIST4, 40 }, { STR_PROPCOMMACR_LIST5, 40 }, @@ -387,14 +387,14 @@ void CPropMacro::InitDialog( HWND hwndDlg ) int pos; RECT rc; ::GetWindowRect( hListView, &rc ); - int width = rc.right - rc.left; + int width = rc.right - rc.left - ::GetSystemMetrics(SM_CXHSCROLL); for( pos = 0; pos < _countof( ColumnList ); ++pos ){ memset_raw( &sColumn, 0, sizeof( sColumn )); sColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_FMT; sColumn.pszText = const_cast(LS(ColumnList[pos].titleId)); - sColumn.cx = ColumnList[pos].width * width / 499; + sColumn.cx = ColumnList[pos].width * width / (499 - 17); sColumn.iSubItem = pos; sColumn.fmt = LVCFMT_LEFT; diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 75f43ef020..c9c8bb7ec1 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -32,9 +32,9 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT #pragma code_page(932) #endif //_WIN32 -#define S_COPYRIGHT "Copyright (C) 1998-2015 by Norio Nakatani & Collaborators" -#define PR_VER 2,3,0,0 -#define PR_VER_STR "2.3.0.0" +#define S_COPYRIGHT "Copyright (C) 1998-2016 by Norio Nakatani & Collaborators" +#define PR_VER 2,3,1,0 +#define PR_VER_STR "2.3.1.0" #define FL_VER PR_VER #define FL_VER_STR PR_VER_STR @@ -1005,7 +1005,7 @@ BEGIN EDITTEXT IDC_EDIT_TABVIEWSTRING,102,108,40,12,ES_AUTOHSCROLL CONTROL "S&PACE�̑}��",IDC_CHECK_INS_SPACE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,70,123,57,10 - COMBOBOX IDC_COMBO_TSV_MODE,16,123,46,8,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_TSV_MODE,16,123,46,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "���C�A�E�g",IDC_STATIC,3,22,145,117 CONTROL "�����C���f���g(&U)",IDC_CHECK_INDENT,"Button", @@ -2271,8 +2271,8 @@ BEGIN 148, 25, 10, 14,WS_EX_TRANSPARENT CONTROL "Check", IDC_CHECK_PLUGIN_OPTION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 36, 216, 200, 10 - COMBOBOX IDC_COMBO_PLUGIN_OPTION, 36, 214, 183, 30, - CBS_DROPDOWNLIST | CBS_HASSTRINGS| WS_TABSTOP + COMBOBOX IDC_COMBO_PLUGIN_OPTION, 36, 214, 183, 150, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "ReadMe(&M)", IDC_PLUGIN_README, 49, 234, 50, 14 DEFPUSHBUTTON "&OK", IDOK, 104, 234, 50, 14 PUSHBUTTON "�L�����Z��(&X)", IDCANCEL, 159, 234, 50, 14 @@ -2280,7 +2280,7 @@ BEGIN END IDD_PROFILEMGR DIALOGEX 0, 0, 191, 184 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "�v���t�@�C���}�l�[�W��" FONT 9, "�l�r �o�S�V�b�N" diff --git a/sakura_core/typeprop/CDlgSameColor.cpp b/sakura_core/typeprop/CDlgSameColor.cpp index b34cea66fc..9400050a25 100644 --- a/sakura_core/typeprop/CDlgSameColor.cpp +++ b/sakura_core/typeprop/CDlgSameColor.cpp @@ -105,7 +105,7 @@ INT_PTR CDlgSameColor::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARA /*! ���[�_���_�C�A���O�̕\�� @param wID [in] �^�C�v�ʐݒ�_�C�A���O�ʼn����ꂽ�{�^��ID - @param pTypes [in/out] �^�C�v�ʐݒ�f�[�^ + @param pTypes [in,out] �^�C�v�ʐݒ�f�[�^ @param cr [in] �w��F @date 2006.04.26 ryoji �V�K�쐬 diff --git a/sakura_core/typeprop/CDlgTypeList.cpp b/sakura_core/typeprop/CDlgTypeList.cpp index 8c75ba2e7c..45f892b37a 100644 --- a/sakura_core/typeprop/CDlgTypeList.cpp +++ b/sakura_core/typeprop/CDlgTypeList.cpp @@ -199,7 +199,6 @@ INT_PTR CDlgTypeList::DispatchEvent( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM switch( HIWORD(wParam) ) { case LBN_SELCHANGE: - DlgItem_Enable( GetHwnd(), IDC_BUTTON_INITIALIZE, nIdx != 0 ); DlgItem_Enable( GetHwnd(), IDC_BUTTON_UP_TYPE, 1 < nIdx ); DlgItem_Enable( GetHwnd(), IDC_BUTTON_DOWN_TYPE, nIdx != 0 && nIdx < GetDllShareData().m_nTypesCount - 1 ); DlgItem_Enable( GetHwnd(), IDC_BUTTON_DEL_TYPE, nIdx != 0 ); @@ -479,21 +478,25 @@ bool CDlgTypeList::Export() return true; } -// �^�C�v�ʐݒ菉���� -// 2010/4/12 Uchi +/*! �^�C�v�ʐݒ菉���� + @date 2010/4/12 Uchi + @date 2016.03.09 Moca ��{�̏��������T�|�[�g�B��{�̎��͓����ݒ�ɖ߂�����ɂ��� + + @retval true ���� + @retval false �ُ� +*/ bool CDlgTypeList::InitializeType( void ) { HWND hwndDlg = GetHwnd(); HWND hwndList = GetDlgItem( GetHwnd(), IDC_LIST_TYPES ); int iDocType = List_GetCurSel( hwndList ); - if (iDocType == 0) { - // ��{�̏ꍇ�ɂ͉������Ȃ� - return true; - } const STypeConfigMini* typeMini; - CDocTypeManager().GetTypeConfigMini(CTypeConfig(iDocType), &typeMini); + if( !CDocTypeManager().GetTypeConfigMini(CTypeConfig(iDocType), &typeMini) ){ + // �Ȃ񂩃G���[������ + return false; + } int nRet; - if ( typeMini->m_szTypeExts[0] != _T('\0') ) { + if( typeMini->m_szTypeExts[0] != _T('\0') || iDocType == 0 ){ nRet = ::MYMESSAGEBOX( GetHwnd(), MB_YESNO | MB_ICONQUESTION, @@ -510,41 +513,47 @@ bool CDlgTypeList::InitializeType( void ) return false; } // _DefaultConfig(&types); //�K��l���R�s�[ - STypeConfig type; - CDocTypeManager().GetTypeConfig(CTypeConfig(0), type); // ��{���R�s�[ - - // �������O�ɂȂ�Ȃ��悤�ɐ������‚��� - int nNameNum = iDocType + 1; - bool bUpdate = true; - for(int i = 1; i < GetDllShareData().m_nTypesCount; i++){ - if( bUpdate ){ - auto_sprintf( type.m_szTypeName, LS(STR_DLGTYPELIST_SETNAME), nNameNum ); - nNameNum++; - bUpdate = false; - } - if( iDocType == i ){ - continue; - } - const STypeConfigMini* typeMini2; - CDocTypeManager().GetTypeConfigMini(CTypeConfig(i), &typeMini2); - if( auto_strcmp(typeMini2->m_szTypeName, type.m_szTypeName) == 0 ){ - i = 0; - bUpdate = true; + std::auto_ptr type(new STypeConfig()); + if( 0 != iDocType ){ + CDocTypeManager().GetTypeConfig(CTypeConfig(0), *type); // ��{���R�s�[ + + // �������O�ɂȂ�Ȃ��悤�ɐ������‚��� + int nNameNum = iDocType + 1; + bool bUpdate = true; + for(int i = 1; i < GetDllShareData().m_nTypesCount; i++){ + if( bUpdate ){ + auto_sprintf( type->m_szTypeName, LS(STR_DLGTYPELIST_SETNAME), nNameNum ); + nNameNum++; + bUpdate = false; + } + if( iDocType == i ){ + continue; + } + const STypeConfigMini* typeMini2; + CDocTypeManager().GetTypeConfigMini(CTypeConfig(i), &typeMini2); + if( auto_strcmp(typeMini2->m_szTypeName, type->m_szTypeName) == 0 ){ + i = 0; + bUpdate = true; + } } + _tcscpy( type->m_szTypeExts, _T("") ); + type->m_nIdx = iDocType; + type->m_id = (::GetTickCount() & 0x3fffffff) + iDocType * 0x10000; + type->m_nRegexKeyMagicNumber = CRegexKeyword::GetNewMagicNumber(); + }else{ + // 2016.03.09 ��{�̏����� + CType_Basis basis; + basis.InitTypeConfig(0, *type); } - _tcscpy( type.m_szTypeExts, _T("") ); - type.m_nIdx = iDocType; - type.m_id = (::GetTickCount() & 0x3fffffff) + iDocType * 0x10000; - type.m_nRegexKeyMagicNumber = CRegexKeyword::GetNewMagicNumber(); - CDocTypeManager().SetTypeConfig(CTypeConfig(iDocType), type); + CDocTypeManager().SetTypeConfig(CTypeConfig(iDocType), *type); SendChangeSettingType(iDocType); // ���X�g�ď����� SetData(iDocType); - InfoMessage( hwndDlg, LS(STR_DLGTYPELIST_INIT2), type.m_szTypeName ); + InfoMessage( hwndDlg, LS(STR_DLGTYPELIST_INIT2), type->m_szTypeName ); return true; } diff --git a/sakura_core/typeprop/CPropTypesScreen.cpp b/sakura_core/typeprop/CPropTypesScreen.cpp index 2d8f3d013b..20540ef70c 100644 --- a/sakura_core/typeprop/CPropTypesScreen.cpp +++ b/sakura_core/typeprop/CPropTypesScreen.cpp @@ -194,7 +194,7 @@ INT_PTR CPropTypesScreen::DispatchEvent( ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_EDIT_TYPENAME ), FALSE ); //�ݒ�̖��O ::EnableWindow( ::GetDlgItem( hwndDlg, IDC_EDIT_TYPEEXTS ), FALSE ); //�t�@�C���g���q } - UpDown_SetRange(::GetDlgItem(hwndDlg, IDC_SPIN_LINESPACE), LINESPACE_MAX, -LINESPACE_MAX); + UpDown_SetRange(::GetDlgItem(hwndDlg, IDC_SPIN_LINESPACE), -LINESPACE_MAX, LINESPACE_MAX); return TRUE; case WM_COMMAND: diff --git a/sakura_core/typeprop/CPropTypesWindow.cpp b/sakura_core/typeprop/CPropTypesWindow.cpp index 4ab7c63211..ad25b89871 100644 --- a/sakura_core/typeprop/CPropTypesWindow.cpp +++ b/sakura_core/typeprop/CPropTypesWindow.cpp @@ -85,7 +85,7 @@ static const EEolType aeEolType[] = { EOL_PS, }; -/* window ���b�Z�[�W���� */ +/*! window ���b�Z�[�W���� */ INT_PTR CPropTypesWindow::DispatchEvent( HWND hwndDlg, // handle to dialog box UINT uMsg, // message @@ -151,7 +151,6 @@ INT_PTR CPropTypesWindow::DispatchEvent( return TRUE; // To Here Sept. 10, 2000 - } case IDC_CHECK_CP: { ::CheckDlgButton( hwndDlg, IDC_CHECK_CP, TRUE ); @@ -159,6 +158,7 @@ INT_PTR CPropTypesWindow::DispatchEvent( CCodePage::AddComboCodePages( hwndDlg, ::GetDlgItem(hwndDlg, IDC_COMBO_DEFAULT_CODETYPE), -1 ); } return TRUE; + } break; /* BN_CLICKED */ } break; /* WM_COMMAND */ diff --git a/sakura_core/types/CType_Cpp.cpp b/sakura_core/types/CType_Cpp.cpp index 2db5381093..4e85ba6699 100644 --- a/sakura_core/types/CType_Cpp.cpp +++ b/sakura_core/types/CType_Cpp.cpp @@ -1059,6 +1059,8 @@ void CDocOutline::MakeFuncList_C( CFuncInfoArr* pcFuncInfoArr ,bool bVisibleMemb pcFuncInfoArr->AppendData( nItemLine, ptPosXY.GetY2() + CLayoutInt(1), szNamespace, nItemFuncId); } nItemLine = -1; + szWordPrev[0] = L'\0'; + szTemplateName[0] = L'\0'; // hoge < ... ; ��template�ł͂Ȃ������̂ŃN���A nNestLevel_template = 0; nMode2 = M2_NORMAL; // 2002/10/27 frozen �����܂� @@ -1141,13 +1143,13 @@ void CDocOutline::MakeFuncList_C( CFuncInfoArr* pcFuncInfoArr ,bool bVisibleMemb } } - szWord[nWordIdx] = pLine[i]; - szWord[nWordIdx + 1] = L'\0'; // // Mar. 15, 2000 genta // From Here // �����`�F�b�N�͕K�{ if( nWordIdx < nMaxWordLeng ){ nMode = 1; + szWord[nWordIdx] = pLine[i]; + szWord[nWordIdx + 1] = L'\0'; } else{ nMode = 999; @@ -1424,7 +1426,7 @@ void CEditView::SmartIndent_CPP( wchar_t wcChar ) }else if( m_pTypeData->m_bIndentCppCommentIgnore && n + 1 < nLineLen2 && '/' == pLine2[n] && '/' == pLine2[n+1] ){ SCommentBlock block = { n, nLineLen2 - 1 }; arrCommentBlock.push_back(block); - n = k; + n = nLineLen2 - 1; } break; case 1: diff --git a/sakura_core/types/CType_Text.cpp b/sakura_core/types/CType_Text.cpp index 0d05e2249a..44b1deec60 100644 --- a/sakura_core/types/CType_Text.cpp +++ b/sakura_core/types/CType_Text.cpp @@ -183,16 +183,16 @@ void CDocOutline::MakeTopicList_txt( CFuncInfoArr* pcFuncInfoArr ) */ //�s�����񂩂���s����菜�� pLine -> pszText - wchar_t* pszText = new wchar_t[nLineLen + 1]; - wmemcpy( pszText, &pLine[i], nLineLen ); - pszText[nLineLen] = L'\0'; - bool bExtEol = GetDllShareData().m_Common.m_sEdit.m_bEnableExtEol; + const wchar_t* pszText = &pLine[i]; + nLineLen -= i; + const bool bExtEol = GetDllShareData().m_Common.m_sEdit.m_bEnableExtEol; for( i = 0; i < nLineLen; ++i ){ if( WCODE::IsLineDelimiter(pszText[i], bExtEol) ){ - pszText[i] = L'\0'; break; } } + std::wstring strText( pszText, i ); + pszText = strText.c_str(); /* �J�[�\���ʒu�ϊ� @@ -230,13 +230,11 @@ void CDocOutline::MakeTopicList_txt( CFuncInfoArr* pcFuncInfoArr ) // nDepth = nMaxStack; bAppend = false; } - + if( bAppend ){ pcFuncInfoArr->AppendData( nLineCount + CLogicInt(1), ptPos.GetY2() + CLayoutInt(1) , pszText, 0, nDepth ); nDepth++; } - delete [] pszText; - } return; } diff --git a/sakura_core/util/MessageBoxF.cpp b/sakura_core/util/MessageBoxF.cpp index c5eb782b18..7538753ee0 100644 --- a/sakura_core/util/MessageBoxF.cpp +++ b/sakura_core/util/MessageBoxF.cpp @@ -81,7 +81,7 @@ int VMessageBoxF( UINT uType, //!< [in] ���b�Z�[�W�{�b�N�X�̃X�^�C�� (MessageBox�Ɠ����`��) LPCTSTR lpCaption, //!< [in] ���b�Z�[�W�{�b�N�X�̃^�C�g�� LPCTSTR lpText, //!< [in] �\������e�L�X�g�Bprintf�d�l�̏����w�肪�”\�B - va_list& v //!< [in/out] �������X�g + va_list& v //!< [in,out] �������X�g ) { hwndOwner=GetMessageBoxOwner(hwndOwner); diff --git a/sakura_core/util/shell.cpp b/sakura_core/util/shell.cpp index b1a7e70fa4..cececef5c5 100644 --- a/sakura_core/util/shell.cpp +++ b/sakura_core/util/shell.cpp @@ -600,8 +600,8 @@ BOOL MyWinHelp(HWND hwndCaller, UINT uCommand, DWORD_PTR dwData) } /*�t�H���g�I���_�C�A���O - @param plf [in/out] - @param piPointSize [in/out] 1/10�|�C���g�P�� + @param plf [in,out] + @param piPointSize [in,out] 1/10�|�C���g�P�� 2008.04.27 kobake CEditDoc::SelectFont ���番�� 2009.10.01 ryoji �|�C���g�T�C�Y�i1/10�|�C���g�P�ʁj�����lj� diff --git a/sakura_core/util/string_ex.cpp b/sakura_core/util/string_ex.cpp index 6e6a29a9e5..c67f13afb0 100644 --- a/sakura_core/util/string_ex.cpp +++ b/sakura_core/util/string_ex.cpp @@ -642,7 +642,7 @@ template CHAR_TYPE* my_strtok( CHAR_TYPE* pBuffer, //[in] ������o�b�t�@(�I�[�����邱��) int nLen, //[in] ������̒��� - int* pnOffset, //[in/out] �I�t�Z�b�g + int* pnOffset, //[in,out] �I�t�Z�b�g const CHAR_TYPE* pDelimiter //[in] ��؂蕶�� ) { diff --git a/sakura_core/util/string_ex.h b/sakura_core/util/string_ex.h index 1d804cdf90..3d65c94449 100644 --- a/sakura_core/util/string_ex.h +++ b/sakura_core/util/string_ex.h @@ -127,7 +127,7 @@ template CHAR_TYPE* my_strtok( CHAR_TYPE* pBuffer, //[in] ������o�b�t�@(�I�[�����邱��) int nLen, //[in] ������̒��� - int* pnOffset, //[in/out] �I�t�Z�b�g + int* pnOffset, //[in,out] �I�t�Z�b�g const CHAR_TYPE* pDelimiter //[in] ��؂蕶�� ); diff --git a/sakura_core/util/window.h b/sakura_core/util/window.h index 10b7d7d67a..313897de91 100644 --- a/sakura_core/util/window.h +++ b/sakura_core/util/window.h @@ -178,8 +178,8 @@ class CDCFont CDCFont(LOGFONT& font, HWND hwnd = NULL){ m_hwnd = hwnd; m_hDC = ::GetDC(hwnd); - HFONT hFont = ::CreateFontIndirect(&font); - m_hFontOld = (HFONT)::SelectObject(m_hDC, hFont); + m_hFont = ::CreateFontIndirect(&font); + m_hFontOld = (HFONT)::SelectObject(m_hDC, m_hFont); } ~CDCFont(){ if( m_hDC ){ diff --git a/sakura_core/view/CCaret.cpp b/sakura_core/view/CCaret.cpp index 46c89d1209..6fae56d830 100644 --- a/sakura_core/view/CCaret.cpp +++ b/sakura_core/view/CCaret.cpp @@ -423,7 +423,7 @@ CLayoutInt CCaret::MoveCursorToClientPoint( const POINT& ptClientPos, bool test, /*! �������J�[�\���ʒu���Z�o����(EOF�ȍ~�̂�) - @param pptPosXY [in/out] �J�[�\���̃��C�A�E�g���W + @param pptPosXY [in,out] �J�[�\���̃��C�A�E�g���W @retval TRUE ���W���C������ @retval FALSE ���W�͏C������Ȃ����� @note EOF�̒��O�����s�łȂ��ꍇ�́A���̍s�Ɍ���EOF�ȍ~�ɂ��ړ��”\ @@ -1097,7 +1097,7 @@ POINT CCaret::CalcCaretDrawPos(const CLayoutPoint& ptCaretPos) const @date 2007.08.23 ryoji �֐����iMoveCursorToPoint()���珈���𔲂��o���j @date 2007.09.26 ryoji ���p�����ł������ō��E�ɃJ�[�\����U�蕪���� - @date 2007.10.23 kobake ���������̌����C�� ([in/out]��[in]) + @date 2007.10.23 kobake ���������̌����C�� ([in,out]��[in]) @date 2009.02.17 ryoji ���C�A�E�g�s���Ȍ�̃J�����ʒu�w��Ȃ疖�������̑O�ł͂Ȃ����������̌�Ɉړ����� */ CLayoutInt CCaret::MoveCursorProperly( diff --git a/sakura_core/view/CEditView.cpp b/sakura_core/view/CEditView.cpp index 2d0202a907..b71fb191b3 100644 --- a/sakura_core/view/CEditView.cpp +++ b/sakura_core/view/CEditView.cpp @@ -277,7 +277,7 @@ BOOL CEditView::Create( // to here 2002.04.10 minfu //2004.10.23 isearch - m_nISearchMode = 0; + m_nISearchMode = SEARCH_NONE; m_pcmigemo = NULL; // 2007.10.02 nasukoji diff --git a/sakura_core/view/CEditView.h b/sakura_core/view/CEditView.h index 158b1b354a..1231e294f2 100644 --- a/sakura_core/view/CEditView.h +++ b/sakura_core/view/CEditView.h @@ -241,7 +241,7 @@ class CEditView //! ���W�b�N�s��1�s�`�� bool DrawLogicLine( HDC hdc, //!< [in] ���Ώ� - DispPos* pDispPos, //!< [in/out] �`�悷��ӏ��A�`�挳�\�[�X + DispPos* pDispPos, //!< [in,out] �`�悷��ӏ��A�`�挳�\�[�X CLayoutInt nLineTo //!< [in] ���I�����郌�C�A�E�g�s�ԍ� ); @@ -477,7 +477,7 @@ class CEditView private: /* �C���N�������^���T�[�` */ //2004.10.24 isearch migemo - void ISearchEnter( int mode, ESearchDirection direction); + void ISearchEnter( ESearchMode mode, ESearchDirection direction); void ISearchExit(); void ISearchExec(DWORD wChar); void ISearchExec(LPCWSTR pszText); @@ -700,8 +700,8 @@ class CEditView SSearchOption m_sCurSearchOption; // �����^�u�� �I�v�V���� CLogicPoint m_ptSrchStartPos_PHY; // ����/�u���J�n���̃J�[�\���ʒu (���s�P�ʍs�擪����̃o�C�g��(0�J�n), ���s�P�ʍs�̍s�ԍ�(0�J�n)) BOOL m_bSearch; /* ����/�u���J�n�ʒu��o�^���邩 */ // 02/06/26 ai - ESearchDirection m_nISearchDirection; - int m_nISearchMode; + ESearchDirection m_nISearchDirection; //!< �������� + ESearchMode m_nISearchMode; //!< �������[�h bool m_bISearchWrap; bool m_bISearchFlagHistory[256]; int m_nISearchHistoryCount; diff --git a/sakura_core/view/CEditView_Cmdisrch.cpp b/sakura_core/view/CEditView_Cmdisrch.cpp index f6ac8fd16d..8600f6e568 100644 --- a/sakura_core/view/CEditView_Cmdisrch.cpp +++ b/sakura_core/view/CEditView_Cmdisrch.cpp @@ -41,7 +41,7 @@ void CEditView::TranslateCommand_isearch( LPARAM& lparam4 ) { - if (m_nISearchMode <= 0 ) + if (m_nISearchMode <= SEARCH_NONE ) return; switch (nCommand){ @@ -113,22 +113,22 @@ bool CEditView::ProcessCommand_isearch( // �������[�h�ւ̈ڍs case F_ISEARCH_NEXT: - ISearchEnter(1,SEARCH_FORWARD); //�O���C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_NORMAL, SEARCH_FORWARD); //�O���C���N�������^���T�[�` //2004.10.13 isearch return true; case F_ISEARCH_PREV: - ISearchEnter(1,SEARCH_BACKWARD); //����C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_NORMAL, SEARCH_BACKWARD); //����C���N�������^���T�[�` //2004.10.13 isearch return true; case F_ISEARCH_REGEXP_NEXT: - ISearchEnter(2,SEARCH_FORWARD); //�O�����K�\���C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_REGEXP, SEARCH_FORWARD); //�O�����K�\���C���N�������^���T�[�` //2004.10.13 isearch return true; case F_ISEARCH_REGEXP_PREV: - ISearchEnter(2,SEARCH_BACKWARD); //������K�\���C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_REGEXP, SEARCH_BACKWARD); //������K�\���C���N�������^���T�[�` //2004.10.13 isearch return true; case F_ISEARCH_MIGEMO_NEXT: - ISearchEnter(3,SEARCH_FORWARD); //�O��MIGEMO�C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_MIGEMO, SEARCH_FORWARD); //�O��MIGEMO�C���N�������^���T�[�` //2004.10.13 isearch return true; case F_ISEARCH_MIGEMO_PREV: - ISearchEnter(3,SEARCH_BACKWARD); //���MIGEMO�C���N�������^���T�[�` //2004.10.13 isearch + ISearchEnter(SEARCH_MIGEMO, SEARCH_BACKWARD); //���MIGEMO�C���N�������^���T�[�` //2004.10.13 isearch return true; } return false; @@ -145,7 +145,7 @@ bool CEditView::ProcessCommand_isearch( @date 2012.10.11 novice m_sCurSearchOption/m_sSearchOption�̓�����switch�̑O�ɕύX @date 2012.10.11 novice MIGEMO�̏�����case���Ɉړ� */ -void CEditView::ISearchEnter( int mode, ESearchDirection direction) +void CEditView::ISearchEnter( ESearchMode mode, ESearchDirection direction) { if (m_nISearchMode == mode ) { @@ -166,13 +166,13 @@ void CEditView::ISearchEnter( int mode, ESearchDirection direction) m_sCurSearchOption = GetDllShareData().m_Common.m_sSearch.m_sSearchOption; switch( mode ) { - case 1: // �ʏ�C���N�������^���T�[�` + case SEARCH_NORMAL: // �ʏ�C���N�������^���T�[�` m_sCurSearchOption.bRegularExp = false; m_sCurSearchOption.bLoHiCase = false; m_sCurSearchOption.bWordOnly = false; //SendStatusMessage(_T("I-Search: ")); break; - case 2: // ���K�\���C���N�������^���T�[�` + case SEARCH_REGEXP: // ���K�\���C���N�������^���T�[�` if (!m_CurRegexp.IsAvailable()){ WarningBeep(); SendStatusMessage(LS(STR_EDITVWISRCH_REGEX)); @@ -182,7 +182,7 @@ void CEditView::ISearchEnter( int mode, ESearchDirection direction) m_sCurSearchOption.bLoHiCase = false; //SendStatusMessage(_T("[RegExp] I-Search: ")); break; - case 3: // MIGEMO�C���N�������^���T�[�` + case SEARCH_MIGEMO: // MIGEMO�C���N�������^���T�[�` if (!m_CurRegexp.IsAvailable()){ WarningBeep(); SendStatusMessage(LS(STR_EDITVWISRCH_REGEX)); @@ -215,7 +215,7 @@ void CEditView::ISearchEnter( int mode, ESearchDirection direction) // Feb. 04, 2005 genta �����J�n�ʒu���L�^ // �C���N�������^���T�[�`�ԂŃ��[�h��؂�ւ���ꍇ�ɂ͊J�n�ƌ��Ȃ��Ȃ� - if( m_nISearchMode == 0 ){ + if( m_nISearchMode == SEARCH_NONE ){ m_ptSrchStartPos_PHY = GetCaret().GetCaretLogicPos(); } @@ -255,8 +255,8 @@ void CEditView::ISearchExit() GetDllShareData().m_Common.m_sSearch.m_sSearchOption = m_sCurSearchOption; m_pcEditWnd->m_cToolbar.AcceptSharedSearchKey(); m_nISearchDirection = SEARCH_BACKWARD; - m_nISearchMode = 0; - + m_nISearchMode = SEARCH_NONE; + if (m_nISearchHistoryCount == 0){ m_strCurSearchKey.clear(); } @@ -339,7 +339,7 @@ void CEditView::ISearchExec(bool bNext) { //���������s����. - if ( (m_strCurSearchKey.size() == 0) || (m_nISearchMode == 0)){ + if ( (m_strCurSearchKey.size() == 0) || (m_nISearchMode == SEARCH_NONE)){ //�X�e�[�^�X�̕\�� CNativeT msg; ISearchSetStatusMsg(&msg); @@ -355,11 +355,11 @@ void CEditView::ISearchExec(bool bNext) if ( bNext && m_bISearchWrap ) { switch (m_nISearchDirection) { - case 1: + case SEARCH_FORWARD: nLine = CLayoutInt(0); nIdx1 = CLayoutInt(0); break; - case 0: + case SEARCH_BACKWARD: //�Ōォ�猟�� CLogicInt nLineP; int nIdxP; @@ -373,14 +373,14 @@ void CEditView::ISearchExec(bool bNext) } }else if (GetSelectionInfo().IsTextSelected()){ switch( m_nISearchDirection * 2 + (bNext ? 1: 0)){ - case 2 : //�O�������Ō��݈ʒu���猟���̂Ƃ� - case 1 : //��������Ŏ��������̂Ƃ� + case (SEARCH_FORWARD * 2): //�O�������Ō��݈ʒu���猟���̂Ƃ� + case (SEARCH_BACKWARD * 2 + 1): //��������Ŏ��������̂Ƃ� //�I��͈͂̐擪�������J�n�ʒu�� nLine = GetSelectionInfo().m_sSelect.GetFrom().GetY2(); nIdx1 = GetSelectionInfo().m_sSelect.GetFrom().GetX2(); break; - case 0 : //�O�������Ŏ������� - case 3 : //��������Ō��݈ʒu���猟�� + case (SEARCH_BACKWARD * 2): //��������Ō��݈ʒu���猟�� + case (SEARCH_FORWARD * 2 + 1): //�O�������Ŏ������� //�I��͈͂̌�납�� nLine = GetSelectionInfo().m_sSelect.GetTo().GetY2(); nIdx1 = GetSelectionInfo().m_sSelect.GetTo().GetX2(); @@ -414,7 +414,7 @@ void CEditView::ISearchExec(bool bNext) int nSearchResult = m_pcEditDoc->m_cLayoutMgr.SearchWord( nLine, // �����J�n���C�A�E�g�s nIdx, // �����J�n�f�[�^�ʒu - m_nISearchDirection, // 0==�O������ 1==������� + m_nISearchDirection, // �������� &sMatchRange, // �}�b�`���C�A�E�g�͈� m_sSearchPattern ); @@ -502,11 +502,11 @@ void CEditView::ISearchBack(void) { void CEditView::ISearchWordMake(void) { switch ( m_nISearchMode ) { - case 1: // �ʏ�C���N�������^���T�[�` - case 2: // ���K�\���C���N�������^���T�[�` + case SEARCH_NORMAL: // �ʏ�C���N�������^���T�[�` + case SEARCH_REGEXP: // ���K�\���C���N�������^���T�[�` m_sSearchPattern.SetPattern(this->GetHwnd(), m_strCurSearchKey.c_str(), m_strCurSearchKey.size(), m_sCurSearchOption, &m_CurRegexp); break; - case 3: // MIGEMO�C���N�������^���T�[�` + case SEARCH_MIGEMO: // MIGEMO�C���N�������^���T�[�` { //migemo�ő{�� std::wstring strMigemoWord = m_pcmigemo->migemo_query_w(m_strCurSearchKey.c_str()); @@ -535,20 +535,20 @@ void CEditView::ISearchSetStatusMsg(CNativeT* msg) const { switch ( m_nISearchMode){ - case 1 : + case SEARCH_NORMAL: msg->SetString(_T("I-Search") ); break; - case 2 : + case SEARCH_REGEXP: msg->SetString(_T("[RegExp] I-Search") ); break; - case 3 : + case SEARCH_MIGEMO: msg->SetString(_T("[Migemo] I-Search") ); break; default: msg->SetString(_T("")); return; } - if (m_nISearchDirection == 0){ + if (m_nISearchDirection == SEARCH_BACKWARD){ msg->AppendString(_T(" Backward: ")); } else{ @@ -574,17 +574,17 @@ bool CEditView::IsISearchEnabled(int nCommand) const switch( nCommand ) { case F_ISEARCH_NEXT: - return m_nISearchMode == 1 && m_nISearchDirection == 1; + return (m_nISearchMode == SEARCH_NORMAL) && (m_nISearchDirection == SEARCH_FORWARD); case F_ISEARCH_PREV: - return m_nISearchMode == 1 && m_nISearchDirection == 0; + return (m_nISearchMode == SEARCH_NORMAL) && (m_nISearchDirection == SEARCH_BACKWARD); case F_ISEARCH_REGEXP_NEXT: - return m_nISearchMode == 2 && m_nISearchDirection == 1; + return (m_nISearchMode == SEARCH_REGEXP) && (m_nISearchDirection == SEARCH_FORWARD); case F_ISEARCH_REGEXP_PREV: - return m_nISearchMode == 2 && m_nISearchDirection == 0; + return (m_nISearchMode == SEARCH_REGEXP) && (m_nISearchDirection == SEARCH_BACKWARD); case F_ISEARCH_MIGEMO_NEXT: - return m_nISearchMode == 3 && m_nISearchDirection == 1; + return (m_nISearchMode == SEARCH_MIGEMO) && (m_nISearchDirection == SEARCH_FORWARD); case F_ISEARCH_MIGEMO_PREV: - return m_nISearchMode == 3 && m_nISearchDirection == 0; + return (m_nISearchMode == SEARCH_MIGEMO) && (m_nISearchDirection == SEARCH_BACKWARD); } return false; } diff --git a/sakura_core/view/CEditView_Command_New.cpp b/sakura_core/view/CEditView_Command_New.cpp index 477c285f4a..5a8b665761 100644 --- a/sakura_core/view/CEditView_Command_New.cpp +++ b/sakura_core/view/CEditView_Command_New.cpp @@ -114,8 +114,6 @@ void CEditView::InsertData_CEditView( bool bHintNext = false; // �X�V�����s����ɂȂ�”\�������邱�Ƃ��������� bool bKinsoku; // �֑��̗L�� const wchar_t* pLine = m_pcEditDoc->m_cLayoutMgr.GetLineStr( ptInsertPos.GetY2(), &nLineLen, &pcLayout ); - bool bLineModifiedChange = (pLine)? !CModifyVisitor().IsLineModified(pcLayout->GetDocLineRef(), - GetDocument()->m_cDocEditor.m_cOpeBuf.GetNoModifiedSeq()): true; //�֑�������ꍇ��1�s�O����ĕ`����s�� @@@ 2002.04.19 MIK bKinsoku = ( m_pTypeData->m_bWordWrap @@ -336,16 +334,6 @@ void CEditView::InsertData_CEditView( GetDocument()->m_cDocEditor.m_nOpeBlkRedawCount++; } } - -#if 0 // ���łɍs������`��ς� - // �s�ԍ��i�ύX�s�j�\���͉��s�P�ʂ̍s������X�V����K�v������ // 2009.03.26 ryoji - if( bLineModifiedChange ){ // ���ύX�������s���ύX���ꂽ - const CLayout* pcLayoutWk = m_pcEditDoc->m_cLayoutMgr.SearchLineByLayoutY( nStartLine ); - if( pcLayoutWk && pcLayoutWk->GetLogicOffset() ){ // �܂�Ԃ����C�A�E�g�s���H - Call_OnPaint( PAINT_LINENUMBER, false ); - } - } -#endif } } @@ -747,7 +735,6 @@ bool CEditView::ReplaceData_CEditView3( ) { assert( (bFastMode && bRedraw == false) || (!bFastMode) ); // bFastMode�̂Ƃ��� bReadraw == false - bool bLineModifiedChange; bool bUpdateAll = true; bool bDelRangeUpdate = false; @@ -757,40 +744,37 @@ bool CEditView::ReplaceData_CEditView3( // �s�̌�낪�I������Ă����Ƃ��̕s���������邽�߁C // �I��̈悩��s���ȍ~�̕�������菜���D - // �擪 - const CLayout* pcLayout; - CLogicInt len; - const wchar_t* line = NULL; if( !bFastMode ){ + // �擪 + const CLayout* pcLayout; + CLogicInt len; + const wchar_t* line = NULL; line = m_pcEditDoc->m_cLayoutMgr.GetLineStr( sDelRange.GetFrom().GetY2(), &len, &pcLayout ); - } - bLineModifiedChange = (line)? !CModifyVisitor().IsLineModified(pcLayout->GetDocLineRef(), GetDocument()->m_cDocEditor.m_cOpeBuf.GetNoModifiedSeq()): true; - if( line ){ - CLogicInt pos = LineColumnToIndex( pcLayout, sDelRange.GetFrom().GetX2() ); - // Jun. 1, 2000 genta - // ����s�̍s���ȍ~�݂̂��I������Ă���ꍇ���l������ - - // Aug. 22, 2000 genta - // �J�n�ʒu��EOF�̌��̂Ƃ��͎��s�ɑ��鏈�����s��Ȃ� - // ���������Ă��܂��Ƒ��݂��Ȃ��s��Point���ė�����D - if( sDelRange.GetFrom().y < m_pcEditDoc->m_cLayoutMgr.GetLineCount() - 1 && pos >= len){ - if( sDelRange.GetFrom().y == sDelRange.GetTo().y ){ - // GetSelectionInfo().m_sSelect.GetFrom().y <= GetSelectionInfo().m_sSelect.GetTo().y �̓`�F�b�N���Ȃ� - CLayoutPoint tmp = sDelRange.GetFrom(); - tmp.y++; - tmp.x = CLayoutInt(0); - sDelRange.Set(tmp); - } - else { - sDelRange.GetFromPointer()->y++; - sDelRange.SetFromX(CLayoutInt(0)); + if( line ){ + CLogicInt pos = LineColumnToIndex( pcLayout, sDelRange.GetFrom().GetX2() ); + // Jun. 1, 2000 genta + // ����s�̍s���ȍ~�݂̂��I������Ă���ꍇ���l������ + + // Aug. 22, 2000 genta + // �J�n�ʒu��EOF�̌��̂Ƃ��͎��s�ɑ��鏈�����s��Ȃ� + // ���������Ă��܂��Ƒ��݂��Ȃ��s��Point���ė�����D + if( sDelRange.GetFrom().y < m_pcEditDoc->m_cLayoutMgr.GetLineCount() - 1 && pos >= len){ + if( sDelRange.GetFrom().y == sDelRange.GetTo().y ){ + // GetSelectionInfo().m_sSelect.GetFrom().y <= GetSelectionInfo().m_sSelect.GetTo().y �̓`�F�b�N���Ȃ� + CLayoutPoint tmp = sDelRange.GetFrom(); + tmp.y++; + tmp.x = CLayoutInt(0); + sDelRange.Set(tmp); + } + else { + sDelRange.GetFromPointer()->y++; + sDelRange.SetFromX(CLayoutInt(0)); + } + bDelRangeUpdate = true; } - bDelRangeUpdate = true; } - } - // ���� - if( !bFastMode ){ + // ���� line = m_pcEditDoc->m_cLayoutMgr.GetLineStr( sDelRange.GetTo().GetY2(), &len, &pcLayout ); if( line ){ CLayoutInt p = LineIndexToColumn( pcLayout, len ); @@ -938,15 +922,6 @@ bool CEditView::ReplaceData_CEditView3( GetDocument()->m_cDocEditor.m_nOpeBlkRedawCount++; } bUpdateAll = false; -#if 0 // ���ł�1�s�܂Ƃ߂ĕ`��ς� - // �s�ԍ��i�ύX�s�j�\���͉��s�P�ʂ̍s������X�V����K�v������ // 2009.03.26 ryoji - if( bLineModifiedChange ){ // ���ύX�������s���ύX���ꂽ - const CLayout* pcLayoutWk = m_pcEditDoc->m_cLayoutMgr.SearchLineByLayoutY( LRArg.nModLineFrom ); - if( pcLayoutWk && pcLayoutWk->GetLogicOffset() ){ // �܂�Ԃ����C�A�E�g�s���H - Call_OnPaint( PAINT_LINENUMBER, false ); - } - } -#endif } } } diff --git a/sakura_core/view/CEditView_Mouse.cpp b/sakura_core/view/CEditView_Mouse.cpp index 4b973966fe..35dceaa833 100644 --- a/sakura_core/view/CEditView_Mouse.cpp +++ b/sakura_core/view/CEditView_Mouse.cpp @@ -54,7 +54,7 @@ void CEditView::OnLBUTTONDOWN( WPARAM fwKeys, int _xPos , int _yPos ) } //isearch 2004.10.22 isearch���L�����Z������ - if (m_nISearchMode > 0 ){ + if (m_nISearchMode > SEARCH_NONE ){ ISearchExit(); } if( m_nAutoScrollMode ){ @@ -803,7 +803,7 @@ void CEditView::AutoScrollOnTimer() }else if( scrollPos.x > 0 ){ scrollPos.x -= 1; } - SyncScrollH( ScrollAtH( GetTextArea().GetViewLeftCol() + scrollPos.x ) ); + SyncScrollH( ScrollAtH( GetTextArea().GetViewLeftCol() + GetTextMetrics().GetLayoutXDefault(scrollPos.x) ) ); } if( m_bAutoScrollVertical ){ if( scrollPos.y < 0 ){ @@ -1097,8 +1097,8 @@ void CEditView::OnMOUSEMOVE( WPARAM fwKeys, int xPos_, int yPos_ ) SetHandCursor(); // Hand Cursor��ݒ� 2013/1/29 Uchi }else{ //migemo isearch 2004.10.22 - if( m_nISearchMode > 0 ){ - if (m_nISearchDirection == 1){ + if( m_nISearchMode > SEARCH_NONE ){ + if (m_nISearchDirection == SEARCH_FORWARD){ ::SetCursor( ::LoadCursor( G_AppInstance(),MAKEINTRESOURCE(IDC_CURSOR_ISEARCH_F))); }else{ ::SetCursor( ::LoadCursor( G_AppInstance(),MAKEINTRESOURCE(IDC_CURSOR_ISEARCH_B))); diff --git a/sakura_core/view/CEditView_Paint.cpp b/sakura_core/view/CEditView_Paint.cpp index dcd794ad51..c74eb04da5 100644 --- a/sakura_core/view/CEditView_Paint.cpp +++ b/sakura_core/view/CEditView_Paint.cpp @@ -658,15 +658,17 @@ void CEditView::OnPaint2( HDC _hdc, PAINTSTRUCT *pPs, BOOL bDrawFromComptibleBmp // bUseMemoryDC = FALSE; BOOL bUseMemoryDC = (m_hdcCompatDC != NULL); assert_warning(gr != m_hdcCompatDC); + bool bClipping = false; if( bUseMemoryDC ){ hdcOld = gr; gr = m_hdcCompatDC; }else{ - if( bTransText || pPs->rcPaint.bottom - pPs->rcPaint.top <= 2 || pPs->rcPaint.left - pPs->rcPaint.right <= 2 ){ + if( bTransText || pPs->rcPaint.bottom - pPs->rcPaint.top <= 2 || pPs->rcPaint.right - pPs->rcPaint.left <= 2 ){ // ���ߏ����̏ꍇ�t�H���g�̗֊s���d�˓h��ɂȂ邽�ߎ����ŃN���b�s���O�̈��ݒ� // 2�ȉ��͂��Ԃ�A���_�[���C���E�J�[�\���s�c���̍�� // MemoryDC�̏ꍇ�͓]������`�N���b�s���O�̑���ɂȂ��Ă��� gr.SetClipping(pPs->rcPaint); + bClipping = true; } } @@ -788,33 +790,25 @@ void CEditView::OnPaint2( HDC _hdc, PAINTSTRUCT *pPs, BOOL bDrawFromComptibleBmp nLayoutLineTo ); -// if(bDispResult){ -// pPs->rcPaint.bottom += nLineHeight; // EOF�ĕ`��Ή� -// break; -// } - } - } - - - // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // - // �e�L�X�g�̖��������̓h��‚Ԃ� // - // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // - if( !bTransText && sPos.GetDrawPos().y < pPs->rcPaint.bottom ){ - RECT rcBack; - rcBack.left = pPs->rcPaint.left; - rcBack.right = pPs->rcPaint.right; - rcBack.top = sPos.GetDrawPos().y; - rcBack.bottom = pPs->rcPaint.bottom; - - cTextType.FillBack(gr,rcBack); - } - { - if( !m_bMiniMap ){ - GetTextDrawer().DispNoteLine( gr, sPos.GetDrawPos().y, pPs->rcPaint.bottom, pPs->rcPaint.left, pPs->rcPaint.right ); + if(bDispResult){ + // EOF�ĕ`��Ή� + nLayoutLineTo++; + int nBackImageTop = pPs->rcPaint.bottom; + pPs->rcPaint.bottom += nLineHeight; + if(bClipping){ + gr.SetClipping(pPs->rcPaint); + } + if(bTransText){ + HDC hdcBgImg = CreateCompatibleDC(gr); + HBITMAP hOldBmp = (HBITMAP)::SelectObject(hdcBgImg, m_pcEditDoc->m_hBackImg); + RECT rc = pPs->rcPaint; + rc.top = nBackImageTop; + DrawBackImage(gr, rc, hdcBgImg); + SelectObject(hdcBgImg, hOldBmp); + DeleteObject(hdcBgImg); + } + } } - // 2006.04.29 �s�����͍s���Ƃɍ�悵�A�����ł͏c���̎c������ - GetTextDrawer().DispVerticalLines( gr, sPos.GetDrawPos().y, pPs->rcPaint.bottom, CLayoutInt(0), CLayoutInt(-1) ); - GetTextDrawer().DispWrapLine( gr, sPos.GetDrawPos().y, pPs->rcPaint.bottom ); // 2009.10.24 ryoji } cTextType.RewindGraphicsState(gr); @@ -878,7 +872,7 @@ void CEditView::OnPaint2( HDC _hdc, PAINTSTRUCT *pPs, BOOL bDrawFromComptibleBmp */ bool CEditView::DrawLogicLine( HDC _hdc, //!< [in] ���Ώ� - DispPos* _pDispPos, //!< [in/out] �`�悷��ӏ��A�`�挳�\�[�X + DispPos* _pDispPos, //!< [in,out] �`�悷��ӏ��A�`�挳�\�[�X CLayoutInt nLineTo //!< [in] ���I�����郌�C�A�E�g�s�ԍ� ) { diff --git a/sakura_core/view/CEditView_Paint_Bracket.cpp b/sakura_core/view/CEditView_Paint_Bracket.cpp index 5975c0bfea..4233efcba0 100644 --- a/sakura_core/view/CEditView_Paint_Bracket.cpp +++ b/sakura_core/view/CEditView_Paint_Bracket.cpp @@ -300,7 +300,7 @@ static const KAKKO_T g_aKakkos[] = { @param ptLayout [in] �����J�n�_�̕������W @param pptLayoutNew [out] �ړ���̃��C�A�E�g���W - @param mode [in/out] bit0(in) : �\���̈�O�𒲂ׂ邩�H 0:���ׂȂ� 1:���ׂ� + @param mode [in,out] bit0(in) : �\���̈�O�𒲂ׂ邩�H 0:���ׂȂ� 1:���ׂ� bit1(in) : �O�������𒲂ׂ邩�H 0:���ׂȂ� 1:���ׂ� (����bit���Q��) bit2(out) : ���‚������ʒu 0:��� 1:�O (����bit���X�V) diff --git a/sakura_core/view/CTextDrawer.cpp b/sakura_core/view/CTextDrawer.cpp index 22f32f9b6e..2b508c3c0b 100644 --- a/sakura_core/view/CTextDrawer.cpp +++ b/sakura_core/view/CTextDrawer.cpp @@ -557,7 +557,9 @@ void CTextDrawer::DispLineNumber( } //DIFF�}�[�N�`�� - CDiffLineGetter(pCDocLine).DrawDiffMark(gr,y,nLineHeight,fgcolor); + if( !pView->m_bMiniMap ){ + CDiffLineGetter(pCDocLine).DrawDiffMark(gr,y,nLineHeight,fgcolor); + } } // �s�ԍ��ƃe�L�X�g�̌��Ԃ̕`�� diff --git a/sakura_core/view/colors/CColorStrategy.cpp b/sakura_core/view/colors/CColorStrategy.cpp index 01028e8f1a..f56bae9e82 100644 --- a/sakura_core/view/colors/CColorStrategy.cpp +++ b/sakura_core/view/colors/CColorStrategy.cpp @@ -252,7 +252,7 @@ void CColorStrategyPool::NotifyOnStartScanLogic() // 2005.11.20 Moca�R�����g�̐F������ON/OFF�֌W�Ȃ��s���Ă����o�O���C�� void CColorStrategyPool::CheckColorMODE( - CColorStrategy** ppcColorStrategy, //!< [in/out] + CColorStrategy** ppcColorStrategy, //!< [in,out] int nPos, const CStringRef& cLineStr ) diff --git a/sakura_core/window/CEditWnd.cpp b/sakura_core/window/CEditWnd.cpp index a0bd99f58d..3c9c60808d 100644 --- a/sakura_core/window/CEditWnd.cpp +++ b/sakura_core/window/CEditWnd.cpp @@ -1827,6 +1827,8 @@ LRESULT CEditWnd::DispatchEvent( break; case PM_CHANGESETTING_FONT: GetDocument()->OnChangeSetting( true ); // �t�H���g�ŕ��������ς��̂ŁA���C�A�E�g�č\�z + delete [] m_posSaveAry; + m_posSaveAry = NULL; break; case PM_CHANGESETTING_FONTSIZE: if( (-1 == wParam && CWM_CACHE_SHARE == GetLogfontCacheMode()) @@ -1862,9 +1864,6 @@ LRESULT CEditWnd::DispatchEvent( ::SetFocus( GetActiveView().GetHwnd() ); // �t�H�[�J�X��߂� } break; - delete [] m_posSaveAry; - m_posSaveAry = NULL; - break; case PM_CHANGESETTING_TYPE2: cTypeNew = CDocTypeManager().GetDocumentTypeOfPath(GetDocument()->m_cDocFile.GetFilePath()); if (GetDocument()->m_cDocType.GetDocumentType().GetIndex() == wParam diff --git a/sakura_core/window/CEditWnd.h b/sakura_core/window/CEditWnd.h index 34104832af..4bdcbc1423 100644 --- a/sakura_core/window/CEditWnd.h +++ b/sakura_core/window/CEditWnd.h @@ -404,7 +404,7 @@ class CEditWnd LPTSTR m_pszMenubarMessage; //!< ���j���[�o�[�E�[�ɕ\�����郁�b�Z�[�W public: int m_nTimerCount; //!< OnTimer�p 2003.08.29 wmlhq - CLogicPointEx* m_posSaveAry; + CLogicPointEx* m_posSaveAry; //!< �t�H���g�ύX�O�̍��W private: int m_nCurrentFocus; //!< ���݂̃t�H�[�J�X��� int m_nWinSizeType; //!< �T�C�Y�ύX�̃^�C�v�BSIZE_MAXIMIZED, SIZE_MINIMIZED ���B diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index adcb5be7de..d1d8a68aba 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -34,9 +34,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #pragma code_page(932) #endif //_WIN32 -#define S_COPYRIGHT "Copyright (C) 2011-2015 by Lucien & Collaborators" -#define PR_VER 2,3,0,0 -#define PR_VER_STR "2.3.0.0" +#define S_COPYRIGHT "Copyright (C) 2011-2016 by Lucien & Collaborators" +#define PR_VER 2,3,1,0 +#define PR_VER_STR "2.3.1.0" #define FL_VER PR_VER #define FL_VER_STR PR_VER_STR @@ -81,29 +81,29 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Search" FONT 9, "Tahoma" BEGIN - LTEXT "Find what(&N)",IDC_STATIC,5,6,45,8 + LTEXT "Fi&nd what",IDC_STATIC,5,6,45,8 COMBOBOX IDC_COMBO_TEXT,51,4,166,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Match Whole Word(&W)",IDC_CHK_WORD,"Button", + CONTROL "Match Whole &Word",IDC_CHK_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,21,130,10 - CONTROL "Case Sensitive(&C)",IDC_CHK_LOHICASE,"Button", + CONTROL "&Case Sensitive",IDC_CHK_LOHICASE,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,32,130,10 - CONTROL "Regex(&E)",IDC_CHK_REGULAREXP,"Button", + CONTROL "R&egex",IDC_CHK_REGULAREXP,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,43,55,10 - CONTROL "Display a message if not found(&M)", + CONTROL "Display a &message if not found", IDC_CHECK_NOTIFYNOTFOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,140,10 - CONTROL "Automatically close the search dialog(&L)", + CONTROL "Automatica&lly close the search dialog", IDC_CHECK_bAutoCloseDlgFind,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,65,140,10 CONTROL "Re-start search from beginning(end)(&Z)",IDC_CHECK_SEARCHALL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,76,130,10 LTEXT "",IDC_STATIC_JRE32VER,62,43,154,10 - PUSHBUTTON "Previous(&U)",IDC_BUTTON_SEARCHPREV,221,4,58,14,WS_GROUP + PUSHBUTTON "Previo&us",IDC_BUTTON_SEARCHPREV,221,4,58,14,WS_GROUP DEFPUSHBUTTON "Next(&D)",IDC_BUTTON_SEARCHNEXT,221,20,58,14 - PUSHBUTTON "Bookmark(&B)",IDC_BUTTON_SETMARK,221,38,58,14 + PUSHBUTTON "&Bookmark",IDC_BUTTON_SETMARK,221,38,58,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,221,57,58,14,WS_GROUP - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,221,73,58,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,221,73,58,14 END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 245, 203 @@ -135,13 +135,13 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Jump to Line" FONT 9, "Tahoma" BEGIN - LTEXT "Line Number(&N)",IDC_STATIC,5,6,55,8 - EDITTEXT IDC_EDIT_LINENUM,60,4,40,12 + LTEXT "Line &Number",IDC_STATIC,5,6,34,8 + EDITTEXT IDC_EDIT_LINENUM,43,4,40,12 CONTROL "Spin1",IDC_SPIN_LINENUM,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,82,4,9,12 CONTROL "Use Layout(&R)",IDC_RADIO_LINENUM_LAYOUT, - "Button",BS_AUTORADIOBUTTON | WS_GROUP,102,5,87,10 - CONTROL "Use CRLF (&W)",IDC_RADIO_LINENUM_CRLF,"Button", + "Button",BS_AUTORADIOBUTTON | WS_GROUP,94,5,97,10 + CONTROL "Use CRLF(&W)",IDC_RADIO_LINENUM_CRLF,"Button", BS_AUTORADIOBUTTON,102,20,87,10 CONTROL "&PL/SQL Compiler Error Processing",IDC_CHECK_PLSQL, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,10,50, @@ -153,15 +153,15 @@ BEGIN UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,87,64,9, 12 LTEXT "Group",IDC_LABEL_PLSQL1,12,66,34,8,NOT WS_GROUP - LTEXT "(&S)elect from detected PL/SQL package's block", + LTEXT "&Select from detected PL/SQL package's block", IDC_LABEL_PLSQL3,12,81,166,8,NOT WS_GROUP COMBOBOX IDC_COMBO_PLSQLBLOCKS,15,94,168,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "PL/SQL Compile Error Line",IDC_STATIC,5,35,184,80, WS_GROUP - DEFPUSHBUTTON "Jump(&J)",IDC_BUTTON_JUMP,197,5,50,14,WS_GROUP + DEFPUSHBUTTON "&Jump",IDC_BUTTON_JUMP,197,5,50,14,WS_GROUP PUSHBUTTON "Cancel(&X)",IDCANCEL,197,24,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,197,101,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,197,101,50,14 END IDD_FUNCLIST DIALOG DISCARDABLE 0, 0, 240, 289 @@ -179,17 +179,17 @@ BEGIN PUSHBUTTON "��",IDC_BUTTON_MENU,1,255,10,14,NOT WS_TABSTOP CONTROL "��",IDC_BUTTON_WINSIZE,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE,12,255,10,14 - PUSHBUTTON "Copy(&C)",IDC_BUTTON_COPY,24,255,50,14,WS_DISABLED - DEFPUSHBUTTON "Jump(&J)",IDOK,76,255,50,14 + PUSHBUTTON "&Copy",IDC_BUTTON_COPY,24,255,50,14,WS_DISABLED + DEFPUSHBUTTON "&Jump",IDOK,76,255,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,128,255,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,180,255,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,180,255,50,14 CONTROL "Automatically Close(&D)",IDC_CHECK_bAutoCloseDlgFuncList, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,271,81,10 - CONTROL "Swap Focus(&F)",IDC_CHECK_bFunclistSetFocusOnJump, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,88,271,65,10 - CONTROL "Mark Blank Lines(&B)",IDC_CHECK_bMarkUpBlankLineEnable, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,271,77,10 - LTEXT "Sort(&S)",IDC_STATIC_nSortType,3,4,28,8 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,271,79,10 + CONTROL "Swap &Focus",IDC_CHECK_bFunclistSetFocusOnJump, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,271,70,10 + CONTROL "Mark &Blank Lines",IDC_CHECK_bMarkUpBlankLineEnable, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,271,76,10 + LTEXT "&Sort",IDC_STATIC_nSortType,3,5,28,8 PUSHBUTTON "&Setting",IDC_BUTTON_SETTING,3,3,45,14 COMBOBOX IDC_COMBO_nSortType,34,3,94,65,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP @@ -207,33 +207,33 @@ BEGIN LTEXT "File(&T)",IDC_STATIC,5,21,36,8,NOT WS_GROUP COMBOBOX IDC_COMBO_FILE,46,19,257,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Folder(&O)",IDC_STATIC,5,36,38,8 + LTEXT "F&older",IDC_STATIC,5,36,38,8 COMBOBOX IDC_COMBO_FOLDER,46,34,246,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&...",IDC_BUTTON_FOLDER,293,34,9,13 PUSHBUTTON "Up(&B)",IDC_BUTTON_FOLDER_UP,225,49,25,14 - PUSHBUTTON "Cur Folder(&U)",IDC_BUTTON_CURRENTFOLDER,253,49,49,14, + PUSHBUTTON "C&ur Folder",IDC_BUTTON_CURRENTFOLDER,253,49,49,14, BS_MULTILINE - CONTROL "Match Whole Word(&W)",IDC_CHK_WORD,"Button", + CONTROL "Match Whole &Word",IDC_CHK_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,52,125,10 - CONTROL "Search Sub Folders(&S)",IDC_CHK_SUBFOLDER, + CONTROL "Search &Sub Folders",IDC_CHK_SUBFOLDER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,63,113,10 CONTROL "Search from current file(&Q)",IDC_CHK_FROMTHISTEXT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,74,125,10 - CONTROL "Case Sensitive(&C)",IDC_CHK_LOHICASE,"Button", + CONTROL "&Case Sensitive",IDC_CHK_LOHICASE,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,85,119,10 - CONTROL "Regex(&E)",IDC_CHK_REGULAREXP,"Button", + CONTROL "R&egex",IDC_CHK_REGULAREXP,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,96,55,10 LTEXT "",IDC_STATIC_JRE32VER,18,105,159,8 CONTROL "Match Once Per File(&G)", IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,116,119,10 - CONTROL "Output relative path(&V)", + CONTROL "Output Relati&ve Path", IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,5,128,85,10 - CONTROL "Output per directory(&Y)", + WS_TABSTOP,5,128,83,10 + CONTROL "Output per director&y", IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,92,128,85,10 + WS_TABSTOP,90,128,83,10 LTEXT "Encoding(&A)",IDC_STATIC,16,142,62,8 COMBOBOX IDC_COMBO_CHARSET,80,140,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -249,16 +249,16 @@ BEGIN CONTROL "NoHit Line(&1)",IDC_RADIO_NOHIT,"Button", BS_AUTORADIOBUTTON,185,97,56,10 GROUPBOX "Result Ouput",IDC_STATIC,180,63,65,47,WS_GROUP - CONTROL "Normal(&M)",IDC_RADIO_OUTPUTSTYLE1,"Button", + CONTROL "Nor&mal",IDC_RADIO_OUTPUTSTYLE1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,185,124,54,10 - CONTROL "Per-File(&I)",IDC_RADIO_OUTPUTSTYLE2,"Button", + CONTROL "Per-F&ile",IDC_RADIO_OUTPUTSTYLE2,"Button", BS_AUTORADIOBUTTON,185,136,59,10 - CONTROL "Result Only(&R)",IDC_RADIO_OUTPUTSTYLE3,"Button", + CONTROL "&Result Only",IDC_RADIO_OUTPUTSTYLE3,"Button", BS_AUTORADIOBUTTON,185,148,59,10 GROUPBOX "Output Format",IDC_STATIC,180,114,65,47,WS_GROUP - DEFPUSHBUTTON "Find(&F)",IDOK,253,76,49,14,WS_GROUP + DEFPUSHBUTTON "&Find",IDOK,253,76,49,14,WS_GROUP PUSHBUTTON "Cancel(&X)",IDCANCEL,253,130,49,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,253,147,49,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,253,147,49,14 END IDD_GREP_REPLACE DIALOGEX 0, 0, 308, 193 @@ -346,7 +346,7 @@ BEGIN LTEXT "0",IDC_STATIC_HITCOUNT,76,5,44,8,NOT WS_GROUP, WS_EX_RIGHT LTEXT "Found item",IDC_STATIC,122,5,60,8,NOT WS_GROUP - CONTROL "Real Time View(&V)",IDC_CHECK_REALTIMEVIEW,"Button", + CONTROL "Real Time &View",IDC_CHECK_REALTIMEVIEW,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,149,59,84,14 END @@ -357,28 +357,28 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Replace" FONT 9, "Tahoma" BEGIN - LTEXT "Find what(&N)",IDC_STATIC,5,6,52,8 + LTEXT "Fi&nd what",IDC_STATIC,5,6,52,8 COMBOBOX IDC_COMBO_TEXT,57,4,177,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Replace with(&P)",IDC_STATIC,5,21,52,8,NOT WS_GROUP + LTEXT "Re&place with",IDC_STATIC,5,21,52,8,NOT WS_GROUP COMBOBOX IDC_COMBO_TEXT2,57,19,177,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Paste from Clipboard(&T)",IDC_CHK_PASTE,"Button", + CONTROL "Pas&te from Clipboard",IDC_CHK_PASTE,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,41,116,10 - CONTROL "Match Whole Word(&W)",IDC_CHK_WORD,"Button", + CONTROL "Match Whole &Word",IDC_CHK_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,52,140,10 - CONTROL "Case Sensitive(&C)",IDC_CHK_LOHICASE,"Button", + CONTROL "&Case Sensitive",IDC_CHK_LOHICASE,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,63,119,10 - CONTROL "Regex(&E)",IDC_CHK_REGULAREXP,"Button", + CONTROL "R&egex",IDC_CHK_REGULAREXP,"Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,74,55,10 LTEXT "",IDC_STATIC_JRE32VER,16,85,138,8 CONTROL "'Replace All' &Itteratively replaces", IDC_CHECK_CONSECUTIVEALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,95,118,10 - CONTROL "Display a message if not found(&M)", + CONTROL "Display a &message if not found", IDC_CHECK_NOTIFYNOTFOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,107,140,10 - CONTROL "Automatically close dialog(&L)", + CONTROL "Automatica&lly close dialog", IDC_CHECK_bAutoCloseDlgReplace,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,118,128,10 CONTROL "Re-start search from beginning(end)(&Z)",IDC_CHECK_SEARCHALL, @@ -393,17 +393,17 @@ BEGIN CONTROL "(&3) line delete",IDC_RADIO_LINEDELETE,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,156,83,71,10 GROUPBOX "Scope",IDC_STATIC,153,103,81,37,WS_GROUP - CONTROL "Selected text(&S)",IDC_RADIO_SELECTEDAREA,"Button", + CONTROL "&Selected text",IDC_RADIO_SELECTEDAREA,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,156,115,73,10 - CONTROL "Whole Document(&O)",IDC_RADIO_ALLAREA,"Button", + CONTROL "Wh&ole Document",IDC_RADIO_ALLAREA,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,156,126,76,10 - PUSHBUTTON "Search (&U)p",IDC_BUTTON_SEARCHPREV,237,4,58,14,WS_GROUP - DEFPUSHBUTTON "Search (&D)own",IDC_BUTTON_SEARCHNEXT,237,19,58,14 - PUSHBUTTON "(&B)ookmark",IDC_BUTTON_SETMARK,237,38,58,14 - PUSHBUTTON "(&R)eplace",IDC_BUTTON_REPALCE,237,57,58,14 - PUSHBUTTON "Replace (&A)ll",IDC_BUTTON_REPALCEALL,237,73,58,14 + PUSHBUTTON "Search &Up",IDC_BUTTON_SEARCHPREV,237,4,58,14,WS_GROUP + DEFPUSHBUTTON "Search &Down",IDC_BUTTON_SEARCHNEXT,237,19,58,14 + PUSHBUTTON "&Bookmark",IDC_BUTTON_SETMARK,237,38,58,14 + PUSHBUTTON "&Replace",IDC_BUTTON_REPALCE,237,57,58,14 + PUSHBUTTON "Replace &All",IDC_BUTTON_REPALCEALL,237,73,58,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,237,110,58,14,WS_GROUP - PUSHBUTTON "(&H)elp",IDC_BUTTON_HELP,237,127,58,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,237,127,58,14 END IDD_REPLACERUNNING DIALOG DISCARDABLE 0, 0, 190, 35 @@ -427,8 +427,8 @@ FONT 9, "Tahoma" BEGIN EDITTEXT IDC_EDIT_PROPERTY,5,5,260,200,ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - DEFPUSHBUTTON "Close(&C)",IDOK,155,208,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,215,208,50,14 + DEFPUSHBUTTON "&Close",IDOK,155,208,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,215,208,50,14 END IDD_INPUT1 DIALOGEX 0, 0, 185, 55 @@ -449,7 +449,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "File Compare" FONT 9, "Tahoma" BEGIN - LTEXT "(&C)hoose a file from below to use as comparison:", + LTEXT "&Choose a file from below to use as comparison:", IDC_STATIC,5,31,158,8 LISTBOX IDC_LIST_FILES,5,42,355,95,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | @@ -458,7 +458,7 @@ BEGIN BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,288,30,71,10 DEFPUSHBUTTON "&OK",IDOK,184,145,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,244,145,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,304,145,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,304,145,50,14 EDITTEXT IDC_STATIC_COMPARESRC,7,7,355,20,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL,WS_EX_STATICEDGE @@ -468,20 +468,20 @@ IDD_PRINTPREVIEWBAR DIALOG DISCARDABLE 0, 0, 402, 32 STYLE WS_CHILD FONT 9, "Tahoma" BEGIN - DEFPUSHBUTTON "Print(&P)...",IDOK,2,1,55,14 + DEFPUSHBUTTON "&Print...",IDOK,2,1,55,14 PUSHBUTTON "Page &Setup...",IDC_BUTTON_PRINTSETTING,2,16,55,14 - PUSHBUTTON "Prev(&V)",IDC_BUTTON_PREVPAGE,60,1,30,14 - PUSHBUTTON "Next(&N)",IDC_BUTTON_NEXTPAGE,90,1,30,14 + PUSHBUTTON "Pre&v",IDC_BUTTON_PREVPAGE,60,1,30,14 + PUSHBUTTON "&Next",IDC_BUTTON_NEXTPAGE,90,1,30,14 PUSHBUTTON "..&.",IDC_BUTTON_DIRECTPAGE,120,1,9,14 LTEXT "999/999",IDC_STATIC_PAGENUM,131,4,35,8 PUSHBUTTON "Zoom &Out",IDC_BUTTON_ZOOMDOWN,60,16,40,14 PUSHBUTTON "Zoom &In",IDC_BUTTON_ZOOMUP,100,16,40,14 LTEXT "999/999",IDC_STATIC_ZOOM,141,19,35,8 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,167,1,39,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,167,1,39,14 CONTROL "&Antialias",IDC_CHECK_ANTIALIAS,"Button", BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,207,3,43,10 PUSHBUTTON "Close(&Q)",IDCANCEL,167,16,39,14 - PUSHBUTTON "Printer(&R)...",IDC_BUTTON_PRINTERSELECT,208,16,40,14 + PUSHBUTTON "Printe&r...",IDC_BUTTON_PRINTERSELECT,208,16,40,14 ICON IDI_PRINTER, IDC_STATIC, 251, 3, 11, 9, SS_REALSIZEIMAGE LTEXT "Static",IDC_STATIC_PRNDEV,263,4,137,8 LTEXT "Static",IDC_STATIC_PAPER,251,19,149,8 @@ -499,7 +499,7 @@ BEGIN WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Change Name(&2)...",IDC_BUTTON_EDITSETTINGNAME,224,7,69,14 GROUPBOX "Settings",IDC_STATIC,4,22,289,204 - RTEXT "Half Width Font(&F)",IDC_STATIC,5,37,49,8 + RTEXT "Half Width Font",IDC_STATIC,5,37,49,8 COMBOBOX IDC_COMBO_FONT_HAN,56,35,84,230,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP RTEXT "Full Width Font(&K)",IDC_STATIC,5,52,49,8 @@ -511,7 +511,7 @@ BEGIN UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,69,9,12 LTEXT "(1/10mm)",IDC_STATIC,88,71,32,8 RTEXT "144.5pt",IDC_STATIC_FONTSIZE,120,71,22,8 - RTEXT "Line Spacing(&S)",IDC_STATIC,5,85,49,8 + RTEXT "Line &Spacing",IDC_STATIC,5,85,49,8 EDITTEXT IDC_EDIT_LINESPACE,56,83,30,12,ES_AUTOHSCROLL CONTROL "Spin2",IDC_SPIN_LINESPACE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,83,9,12 @@ -525,37 +525,37 @@ BEGIN CONTROL "Spin4",IDC_SPIN_DANSPACE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,111,9,12 LTEXT "(mm)",IDC_STATIC,88,113,17,8 - RTEXT "Paper Size(&Z)",IDC_STATIC,7,131,45,8 + RTEXT "Paper Si&ze",IDC_STATIC,7,131,45,8 COMBOBOX IDC_COMBO_PAPER,56,129,169,145,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Orientation",IDC_STATIC,7,146,45,8 - CONTROL "Portrait(&I)",IDC_RADIO_PORTRAIT,"Button",BS_AUTORADIOBUTTON | + CONTROL "Portra&it",IDC_RADIO_PORTRAIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,145,40,10 - CONTROL "Landscape(&A)",IDC_RADIO_LANDSCAPE,"Button",BS_AUTORADIOBUTTON, + CONTROL "L&andscape",IDC_RADIO_LANDSCAPE,"Button",BS_AUTORADIOBUTTON, 102,145,53,10 - RTEXT "Space/Top(&T)",IDC_STATIC,7,163,45,8 + RTEXT "Space/&Top",IDC_STATIC,7,163,45,8 EDITTEXT IDC_EDIT_MARGINTY,56,161,30,12,ES_AUTOHSCROLL CONTROL "Spin5",IDC_SPIN_MARGINTY,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,161,9,12 LTEXT "(mm)",IDC_STATIC,88,163,17,8 - RTEXT "Bottom(&B)",IDC_STATIC,7,177,45,8 + RTEXT "&Bottom",IDC_STATIC,7,177,45,8 EDITTEXT IDC_EDIT_MARGINBY,56,175,30,12,ES_AUTOHSCROLL CONTROL "Spin6",IDC_SPIN_MARGINBY,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,175,9,12 LTEXT "(mm)",IDC_STATIC,88,177,17,8 - RTEXT "Left(&L)",IDC_STATIC,7,191,45,8 + RTEXT "&Left",IDC_STATIC,7,191,45,8 EDITTEXT IDC_EDIT_MARGINLX,56,189,30,12,ES_AUTOHSCROLL CONTROL "Spin7",IDC_SPIN_MARGINLX,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,189,9,12 LTEXT "(mm)",IDC_STATIC,88,191,17,8 - RTEXT "Right(&R)",IDC_STATIC,7,205,45,8 + RTEXT "&Right",IDC_STATIC,7,205,45,8 EDITTEXT IDC_EDIT_MARGINRX,56,202,30,12,ES_AUTOHSCROLL CONTROL "Spin8",IDC_SPIN_MARGINRX,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,202,9,12 LTEXT "(mm)",IDC_STATIC,88,205,17,8 - CONTROL "Pri(&n)t Line nr",IDC_CHECK_LINENUMBER,"Button", + CONTROL "Pri&nt Line nr",IDC_CHECK_LINENUMBER,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,150,35,70,10 - CONTROL "Word Wrap(&W)",IDC_CHECK_WORDWRAP,"Button", + CONTROL "&Word Wrap",IDC_CHECK_WORDWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,150,49,78,10 CONTROL "cant-start rule",IDC_CHECK_PS_KINSOKUHEAD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,150,63,54,10 @@ -592,7 +592,7 @@ BEGIN SS_CENTERIMAGE DEFPUSHBUTTON "&OK",IDOK,128,234,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,183,234,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,238,234,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,238,234,50,14 END IDD_EXITING DIALOG DISCARDABLE 0, 0, 171, 30 @@ -611,32 +611,32 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Execute an external command" FONT 9, "Tahoma" BEGIN - LTEXT "Name(&N)",IDC_STATIC,5,6,29,8 + LTEXT "&Name",IDC_STATIC,5,6,29,8 COMBOBOX IDC_COMBO_m_szCommand,37,4,251,240,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&...",IDC_BUTTON_REFERENCE,278,20,9,12,WS_GROUP - CONTROL "Capture Standard Output(&S)",IDC_CHECK_GETSTDOUT,"Button", + CONTROL "Capture &Standard Output",IDC_CHECK_GETSTDOUT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,29,99,10 COMBOBOX IDC_COMBO_CODE_GET,16,42,73,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Capture Standard Input(&I)",IDC_CHECK_SENDSTDIN,"Button", + CONTROL "Capture Standard &Input",IDC_CHECK_SENDSTDIN,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,58,92,10 COMBOBOX IDC_COMBO_CODE_SEND,16,72,73,10,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Output Window(&O)",IDC_RADIO_OUTPUT,"Button", + CONTROL "&Output Window",IDC_RADIO_OUTPUT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,102,51,93,10 CONTROL "Editor Window(&C)",IDC_RADIO_EDITWINDOW,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,196,51,87,10 GROUPBOX "Std Out Redirect Address",IDC_STATIC,98,39,190,29, WS_GROUP - CONTROL "Current Directory(&R)",IDC_CHECK_CUR_DIR,"Button", + CONTROL "Cu&rrent Directory",IDC_CHECK_CUR_DIR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,86,93,10 COMBOBOX IDC_COMBO_CUR_DIR,16,100,263,240,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_BUTTON_REFERENCE2,279,100,9,12,WS_GROUP - DEFPUSHBUTTON "Exec(&E)",IDOK,117,116,50,14 + DEFPUSHBUTTON "&Exec",IDOK,117,116,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,177,116,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,237,116,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,237,116,50,14 LTEXT "[Note] $F=Editor Filename, $$=$",IDC_STATIC,140,21, 134,8 END @@ -690,7 +690,7 @@ STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | FONT 9, "Tahoma" BEGIN LTEXT "",IDC_STATIC_STC32,0,0,261,8 - LTEXT "Encoding(&C):",IDC_STATIC,5,15,64,8 + LTEXT "En&coding:",IDC_STATIC,5,15,64,8 COMBOBOX IDC_COMBO_CODE,71,13,50,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | @@ -700,10 +700,10 @@ BEGIN LTEXT "CR Code(&E):",IDC_STATIC_EOL,181,15,45,8 COMBOBOX IDC_COMBO_EOL,226,13,50,126,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Recent File(&F):",IDC_STATIC,5,32,59,8 + LTEXT "Recent &File:",IDC_STATIC,5,32,59,8 COMBOBOX IDC_COMBO_MRU,71,30,185,236,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Recent Folder(&D):",IDC_STATIC,5,49,61,8 + LTEXT "Recent Fol&der:",IDC_STATIC,5,49,61,8 COMBOBOX IDC_COMBO_OPENFOLDER,71,46,185,236,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -713,12 +713,12 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "File has changed" FONT 9, "Tahoma" BEGIN - PUSHBUTTON "Reload(&R)",IDC_BTN_RELOAD,7,63,50,14 - DEFPUSHBUTTON "Close(&C)",IDC_BTN_CLOSE,59,63,50,14 - PUSHBUTTON "Autoload while not modified(&L)",IDC_BTN_AUTOLOAD, 114,63,102,14 - PUSHBUTTON "Notify me later(&M)",IDC_BTN_NOTIFYONLY,7,81,102, + PUSHBUTTON "&Reload",IDC_BTN_RELOAD,7,63,50,14 + DEFPUSHBUTTON "&Close",IDC_BTN_CLOSE,59,63,50,14 + PUSHBUTTON "Auto&load while not modified",IDC_BTN_AUTOLOAD, 114,63,102,14 + PUSHBUTTON "Notify &me later",IDC_BTN_NOTIFYONLY,7,81,102, 14 - PUSHBUTTON "Dont Notify me again(&N)",IDC_BTN_NOSUPERVISION, 114,81, + PUSHBUTTON "Dont &Notify me again",IDC_BTN_NOSUPERVISION, 114,81, 102,14 EDITTEXT IDC_UPDATEDFILENAME,7,7,209,25,ES_READONLY | NOT WS_TABSTOP | ES_MULTILINE @@ -762,16 +762,16 @@ BEGIN PUSHBUTTON "Add(&I)",IDC_BUTTON_ADD_FAVORITE,5,237,50,14 LTEXT " Clear History:",IDC_STATIC_BUTTONS,65,237,45,14, SS_CENTERIMAGE - PUSHBUTTON "All(&A)...",IDC_BUTTON_CLEAR,111,237,50,14 - PUSHBUTTON "Except Favorite(&F)...",IDC_BUTTON_DELETE_NOFAVORATE,163, + PUSHBUTTON "&All...",IDC_BUTTON_CLEAR,111,237,50,14 + PUSHBUTTON "Except &Favorite...",IDC_BUTTON_DELETE_NOFAVORATE,163, 237,75,14 PUSHBUTTON "Missing(&N)...",IDC_BUTTON_DELETE_NOTFOUND,241,237, 72,14 - PUSHBUTTON "Selected(&D)",IDC_BUTTON_DELETE_SELECTED,315,237,58,14 - DEFPUSHBUTTON "Close(&C)",IDOK,260,255,50,14 + PUSHBUTTON "Selecte&d",IDC_BUTTON_DELETE_SELECTED,315,237,58,14 + DEFPUSHBUTTON "&Close",IDOK,260,255,50,14 CONTROL "Tab1",IDC_TAB_FAVORITE,"SysTabControl32",WS_TABSTOP,3,4, 374,15 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,320,255,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,320,255,50,14 LTEXT "Message",IDC_STATIC_FAVORITE_MSG,4,254,250,19 END @@ -783,20 +783,20 @@ CAPTION "Direct Tag Jump List" FONT 9, "Tahoma" BEGIN LTEXT "DIR",IDC_STATIC_BASEDIR,4,151,276,8,SS_NOPREFIX - LTEXT "Keyword(&K)",IDC_STATIC_KEYWORD,4,162,100,8,SS_NOPREFIX + LTEXT "&Keyword",IDC_STATIC_KEYWORD,4,162,100,8,SS_NOPREFIX COMBOBOX IDC_KEYWORD,3,172,134,180,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP CONTROL "List1",IDC_LIST_TAGJUMP,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,4,403,143 - PUSHBUTTON "Previous(&P)",IDC_BUTTON_PREVTAG,296,152,50,14 - PUSHBUTTON "Next(&N)",IDC_BUTTON_NEXTTAG,349,152,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,243,170,50,14 - DEFPUSHBUTTON "Jump(&J)",IDOK,296,170,50,14 + PUSHBUTTON "&Previous",IDC_BUTTON_PREVTAG,296,152,50,14 + PUSHBUTTON "&Next",IDC_BUTTON_NEXTTAG,349,152,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,243,170,50,14 + DEFPUSHBUTTON "&Jump",IDOK,296,170,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,349,170,50,14 CONTROL "Case Insensitive(&F)",IDC_CHECK_ICASE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,144,163,93,10 - CONTROL "Match inside string(&A)",IDC_CHECK_ANYWHERE,"Button", + CONTROL "M&atch inside string",IDC_CHECK_ANYWHERE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,144,175,93,10 END @@ -817,7 +817,7 @@ BEGIN EDITTEXT IDC_EDIT_TAG_MAKE_CMDLINE,96,47,130,12,ES_AUTOHSCROLL DEFPUSHBUTTON "Create(&O)",IDOK,68,64,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,122,64,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,176,64,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,176,64,50,14 END IDD_OPERATIONRUNNING DIALOG DISCARDABLE 0, 0, 190, 35 @@ -852,26 +852,26 @@ BEGIN LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - CONTROL "Case Insensitive(&C)",IDC_CHECK_DIFF_OPT_CASE, + CONTROL "&Case Insensitive",IDC_CHECK_DIFF_OPT_CASE, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,191, 101,10 - CONTROL "Ignore Whitespace(&W)",IDC_CHECK_DIFF_OPT_SPACE,"Button", + CONTROL "Ignore &Whitespace",IDC_CHECK_DIFF_OPT_SPACE,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,203,101,10 CONTROL "Ignore diff in whitespace(&B)",IDC_CHECK_DIFF_OPT_SPCCHG,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,216,101,10 - CONTROL "Ignore Blank Lines(&L)",IDC_CHECK_DIFF_OPT_BLINE,"Button", + CONTROL "Ignore Blank &Lines",IDC_CHECK_DIFF_OPT_BLINE,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,229,101,10 - CONTROL "Tab whitespace diff(&T)",IDC_CHECK_DIFF_OPT_TABSPC,"Button", + CONTROL "&Tab whitespace diff",IDC_CHECK_DIFF_OPT_TABSPC,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,242,101,10 GROUPBOX "Editor File is...",IDC_FRAME_DIFF_FILE12,110,190,146, 26,WS_GROUP - CONTROL "New File(&N)",IDC_RADIO_DIFF_FILE1,"Button", + CONTROL "&New File",IDC_RADIO_DIFF_FILE1,"Button", BS_AUTORADIOBUTTON | WS_GROUP,119,201,59,10 - CONTROL "Old File(&D)",IDC_RADIO_DIFF_FILE2,"Button", + CONTROL "Ol&d File",IDC_RADIO_DIFF_FILE2,"Button", BS_AUTORADIOBUTTON | WS_GROUP,183,201,59,10 GROUPBOX "Jump to Prev(Next) diff",IDC_FRAME_SEARCH_MSG,110, 221,146,41 - CONTROL "Show message if not found(&M)", + CONTROL "Show &message if not found", IDC_CHECK_NOTIFYNOTFOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,232,140,10 CONTROL "Continue search from top of file(&Z)",IDC_CHECK_SEARCHALL, @@ -881,7 +881,7 @@ BEGIN WS_TABSTOP,110,267,139,10 DEFPUSHBUTTON "&OK",IDOK,93,282,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,147,282,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,202,282,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,202,282,50,14 LTEXT "Current Editor File",IDC_STATIC,7,7,61,8 EDITTEXT IDC_STATIC_DIFF_SRC,7,18,249,23,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | @@ -899,7 +899,7 @@ BEGIN WS_BORDER | WS_TABSTOP,2,2,175,162 DEFPUSHBUTTON "&OK",IDOK,19,168,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,73,168,50,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,127,168,50,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,127,168,50,14 END IDD_SETCHARSET DIALOGEX 0, 0, 186, 45 @@ -907,7 +907,7 @@ STYLE DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFR CAPTION "Select Encoding" FONT 9, "Tahoma" BEGIN - LTEXT "Encoding(&C):", IDC_STATIC, 5, 9, 64, 8 + LTEXT "En&coding:", IDC_STATIC, 5, 9, 64, 8 COMBOBOX IDC_COMBO_CHARSET, 71, 7, 50, 126, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "C&P", IDC_CHECK_CP, 71, 26, 25, 10 @@ -922,25 +922,25 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Document Type List" FONT 9, "Tahoma" BEGIN - LTEXT "Selec(&T) the type from below:",IDC_STATIC,5,5,111,8 + LTEXT "Selec&t the type from below:",IDC_STATIC,5,5,111,8 LISTBOX IDC_LIST_TYPES,5,15,120,258,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - DEFPUSHBUTTON "(&S)ettings...",IDOK,130,15,50,14 + DEFPUSHBUTTON "&Settings...",IDOK,130,15,50,14 PUSHBUTTON "Temp Apply(&R)",IDC_BUTTON_TEMPCHANGE,130,31,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,130,50,50,14 - PUSHBUTTON "Import(&I)",IDC_BUTTON_IMPORT,130,79,50,14 - PUSHBUTTON "Export(&E)",IDC_BUTTON_EXPORT,130,95,50,14 - PUSHBUTTON "Initialize(&N)",IDC_BUTTON_INITIALIZE,130,111,50,14 - PUSHBUTTON "Duplicate(&C)",IDC_BUTTON_COPY_TYPE,130,127,50,14 - PUSHBUTTON "Up(&U)",IDC_BUTTON_UP_TYPE,130,143,50,14 - PUSHBUTTON "Down(&O)",IDC_BUTTON_DOWN_TYPE,130,159,50,14 - PUSHBUTTON "Add(&A)",IDC_BUTTON_ADD_TYPE,130,175,50,14 - PUSHBUTTON "Del(&D)",IDC_BUTTON_DEL_TYPE,130,191,50,14 + PUSHBUTTON "&Import",IDC_BUTTON_IMPORT,130,79,50,14 + PUSHBUTTON "&Export",IDC_BUTTON_EXPORT,130,95,50,14 + PUSHBUTTON "I&nitialize",IDC_BUTTON_INITIALIZE,130,111,50,14 + PUSHBUTTON "Dupli&cate",IDC_BUTTON_COPY_TYPE,130,127,50,14 + PUSHBUTTON "&Up",IDC_BUTTON_UP_TYPE,130,143,50,14 + PUSHBUTTON "D&own",IDC_BUTTON_DOWN_TYPE,130,159,50,14 + PUSHBUTTON "&Add",IDC_BUTTON_ADD_TYPE,130,175,50,14 + PUSHBUTTON "&Del",IDC_BUTTON_DEL_TYPE,130,191,50,14 CONTROL "Add to Context Menu",IDC_CHECK_EXT_RMENU,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_DISABLED | WS_TABSTOP,130,207,50,28 + BS_MULTILINE | WS_DISABLED | WS_TABSTOP,130,207,54,28 CONTROL "Open on Double Click",IDC_CHECK_EXT_DBLCLICK,"Button",BS_AUTOCHECKBOX | - BS_MULTILINE | WS_DISABLED | WS_TABSTOP,130,231,50,28 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,130,262,50,14 + BS_MULTILINE | WS_DISABLED | WS_TABSTOP,130,231,54,28 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,130,262,50,14 END IDD_TYPE_ASCERTAIN DIALOGEX 0, 0, 187, 100 @@ -950,20 +950,20 @@ CAPTION "Import Document Type Settings" FONT 9, "Tahoma" BEGIN LTEXT "Import to:", IDC_STATIC, 7, 7, 33, 8 - CONTROL "New Add(&A)", IDC_RADIO_TYPE_ADD,"Button",BS_AUTORADIOBUTTON, + CONTROL "New &Add", IDC_RADIO_TYPE_ADD,"Button",BS_AUTORADIOBUTTON, 36,7,45,8 CONTROL "Default", IDC_RADIO_TYPE_TO,"Button",BS_AUTORADIOBUTTON, 86,7,135,8 LTEXT "Type Name:", IDC_STATIC, 7, 27, 33, 8 LTEXT "Default", IDC_STATIC_TYPE_FILE, 45, 27, 135, 16 - LTEXT "Color(&C)", IDC_STATIC, 7, 47, 35, 8 + LTEXT "&Color", IDC_STATIC, 7, 47, 35, 8 COMBOBOX IDC_COMBO_COLORS, 44, 45, 100, 250, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Press OK to import type setting.", IDC_STATIC_MSG, 26, 64, 154, 8 DEFPUSHBUTTON "&OK", IDOK, 26, 79, 50, 14 PUSHBUTTON "Cancel(&X)", IDCANCEL, 78, 79, 50, 14 - PUSHBUTTON "Help(&H)", IDC_BUTTON_HELP, 130, 79, 50, 14 + PUSHBUTTON "&Help", IDC_BUTTON_HELP, 130, 79, 50, 14 END IDD_PROP_SCREEN DIALOGEX 0, 0, 302, 244 @@ -972,31 +972,31 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - LTEXT "Name(&N)",IDC_STATIC,5,6,49,8 + LTEXT "&Name",IDC_STATIC,5,6,49,8 EDITTEXT IDC_EDIT_TYPENAME,55,4,59,12,ES_AUTOHSCROLL - LTEXT "File Ext(&X)",IDC_STATIC,124,6,58,8 + LTEXT "File E&xt",IDC_STATIC,124,6,58,8 EDITTEXT IDC_EDIT_TYPEEXTS,184,4,113,12,ES_AUTOHSCROLL RTEXT "Line Wrap Method(&<)",IDC_STATIC,8,34,56,8,NOT WS_GROUP COMBOBOX IDC_COMBO_WRAPMETHOD,70,32,72,78,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Wrap@Col(&R)",IDC_STATIC,8,49,56,8,NOT WS_GROUP + RTEXT "W&rap@Col",IDC_STATIC,8,49,56,8,NOT WS_GROUP EDITTEXT IDC_EDIT_MAXLINELEN,70,48,40,12 CONTROL "Spin1",IDC_SPIN_MAXLINELEN,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,117,48,9, 12,WS_EX_TRANSPARENT - RTEXT "Letter spacing(&C)",IDC_STATIC,8,64,56,8,NOT WS_GROUP + RTEXT "Letter spa&cing",IDC_STATIC,8,64,56,8,NOT WS_GROUP EDITTEXT IDC_EDIT_CHARSPACE,70,63,40,12 CONTROL "Spin1",IDC_SPIN_CHARSPACE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,117,63,9, 12,WS_EX_TRANSPARENT LTEXT "dot",IDC_STATIC,114,64,18,8 - RTEXT "Line spaceing(&L)",IDC_STATIC,8,79,56,8,NOT WS_GROUP + RTEXT "&Line spaceing",IDC_STATIC,8,79,56,8,NOT WS_GROUP EDITTEXT IDC_EDIT_LINESPACE,70,78,40,12,ES_AUTOHSCROLL CONTROL "Spin3",IDC_SPIN_LINESPACE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,117,78,9, 12 LTEXT "dot",IDC_STATIC,114,79,18,8 - RTEXT "TAB Width(&T)",IDC_STATIC,8,94,56,8,NOT WS_GROUP + RTEXT "&TAB Width",IDC_STATIC,8,94,56,8,NOT WS_GROUP EDITTEXT IDC_EDIT_TABSPACE,70,93,40,12,ES_AUTOHSCROLL CONTROL "Spin3",IDC_SPIN_TABSPACE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,117,93,7, @@ -1007,29 +1007,29 @@ BEGIN EDITTEXT IDC_EDIT_TABVIEWSTRING,103,108,40,12,ES_AUTOHSCROLL CONTROL "Insert S&PACE",IDC_CHECK_INS_SPACE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,70,123,57,10 - COMBOBOX IDC_COMBO_TSV_MODE,16,123,46,8,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_TSV_MODE,16,123,46,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Layout",IDC_STATIC,3,22,145,117 - CONTROL "Auto-Indent(&U)",IDC_CHECK_INDENT,"Button", + CONTROL "A&uto-Indent",IDC_CHECK_INDENT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,154,72,10 CONTROL "Full Width Space Chr(&Z)",IDC_CHECK_INDENT_WSPACE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,83,154,61,10 - LTEXT "Smart-Indent(&S)",IDC_STATIC,8,169,68,8 + LTEXT "&Smart-Indent",IDC_STATIC,8,169,68,8 COMBOBOX IDC_COMBO_SMARTINDENT,82,167,60,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Alternative Indent Char(&I)",IDC_STATIC,8,183,120,8 + LTEXT "Alternative &Indent Char",IDC_STATIC,8,183,120,8 EDITTEXT IDC_EDIT_INDENTCHARS,38,195,103,12,ES_AUTOHSCROLL LTEXT "Wrapped Line Indent(&2)",IDC_STATIC,8,211,75,8 COMBOBOX IDC_COMBO_INDENTLAYOUT,87,209,54,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Trim Blank at end of line(&E)",IDC_CHECK_RTRIM_PREVLINE, + CONTROL "Trim Blank at &end of line",IDC_CHECK_RTRIM_PREVLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,224,113,10 GROUPBOX "Indent",IDC_STATIC,3,143,145,97 CONTROL "Standard Rules(&B)",IDC_RADIO_OUTLINEDEFAULT,"Button", BS_AUTORADIOBUTTON | WS_GROUP,162,33,82,10 COMBOBOX IDC_COMBO_OUTLINES,173,46,81,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Rule File(&F)",IDC_RADIO_OUTLINERULEFILE,"Button", + CONTROL "Rule File(&D)",IDC_RADIO_OUTLINERULEFILE,"Button", BS_AUTORADIOBUTTON,162,63,69,10 EDITTEXT IDC_EDIT_OUTLINERULEFILE,173,74,92,14,ES_AUTOHSCROLL PUSHBUTTON "(&1)...",IDC_BUTTON_RULEFILE_REF,268,74,20,14 @@ -1038,9 +1038,9 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,162,108,48,10 LTEXT "Font(nnpt)",IDC_STATIC_TYPEFONT,210,105,85,16, SS_CENTERIMAGE - PUSHBUTTON "Font(&F)...",IDC_BUTTON_TYPEFONT,173,121,80,14 + PUSHBUTTON "&Font...",IDC_BUTTON_TYPEFONT,173,121,80,14 GROUPBOX "Type Specific Font",IDC_STATIC,153,97,145,42 - CONTROL "ASCII Word Wrap(&W)",IDC_CHECK_WORDWRAP,"Button", + CONTROL "ASCII &Word Wrap",IDC_CHECK_WORDWRAP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,162,154,78,10 CONTROL "Dont wrap new-line(&^)",IDC_CHECK_KINSOKURET,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,162,168,100,10 @@ -1062,15 +1062,15 @@ IDD_PROP_COLOR DIALOGEX DISCARDABLE 0, 0, 302, 244 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "Tahoma" BEGIN - GROUPBOX "Colors(&L)",IDC_STATIC,3,6,148,204,WS_GROUP + GROUPBOX "Co&lors",IDC_STATIC,3,6,148,204,WS_GROUP LISTBOX IDC_LIST_COLORS,6,18,142,148,LBS_OWNERDRAWFIXED | WS_VSCROLL | WS_GROUP | WS_TABSTOP CONTROL "Enable hilight(&D)",IDC_CHECK_DISP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,6,165,65,10 - CONTROL "Bold(&B)",IDC_CHECK_BOLD,"Button",BS_AUTOCHECKBOX | + CONTROL "&Bold",IDC_CHECK_BOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,165,36,10 - CONTROL "Underline(&U)",IDC_CHECK_UNDERLINE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,112,165,36,10 + CONTROL "&Underline",IDC_CHECK_UNDERLINE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,100,165,40,10 LTEXT "Text(C)",IDC_STATIC_MOZI,16,181,34,8 CONTROL "&C",IDC_BUTTON_TEXTCOLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,54,178,25,14 @@ -1080,9 +1080,9 @@ BEGIN CONTROL "&K",IDC_BUTTON_BACKCOLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,54,193,25,14 PUSHBUTTON "Unify color(&>)...",IDC_BUTTON_SAMEBKCOLOR,84,193,58,14 - PUSHBUTTON "Import(&I)...",IDC_BUTTON_IMPORT,25,215,60,14, + PUSHBUTTON "&Import...",IDC_BUTTON_IMPORT,25,215,60,14, WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_EXPORT,88,215,60,14 + PUSHBUTTON "E&xport...",IDC_BUTTON_EXPORT,88,215,60,14 LTEXT "Keyword Set &1",IDC_STATIC,162,18,54,8 COMBOBOX IDC_COMBO_SET,218,16,75,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -1091,7 +1091,7 @@ BEGIN GROUPBOX "Keyword Highlighting",IDC_STATIC,156,6,142,60,WS_GROUP LTEXT "Block(&F)",IDC_STATIC,164,80,42,8 EDITTEXT IDC_EDIT_BLOCKCOMMENT_FROM,211,78,27,12,ES_AUTOHSCROLL - LTEXT "to(&T)",IDC_STATIC,245,80,18,8,NOT WS_GROUP + LTEXT "&to",IDC_STATIC,245,80,18,8,NOT WS_GROUP EDITTEXT IDC_EDIT_BLOCKCOMMENT_TO,267,78,26,12,ES_AUTOHSCROLL LTEXT "Block(&A)",IDC_STATIC,164,94,42,8 EDITTEXT IDC_EDIT_BLOCKCOMMENT_FROM2,211,92,27,12,ES_AUTOHSCROLL @@ -1107,7 +1107,7 @@ BEGIN UDS_AUTOBUDDY | UDS_ARROWKEYS,295,108,6,12 LTEXT "Line(&E)",IDC_STATIC,164,124,25,8 EDITTEXT IDC_EDIT_LINECOMMENT2,195,122,24,12,ES_AUTOHSCROLL - CONTROL "Col(&O)",IDC_CHECK_LCPOS2,"Button",BS_AUTOCHECKBOX | + CONTROL "C&ol",IDC_CHECK_LCPOS2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,223,123,34,10 RTEXT "&[",IDC_LABEL_LCPOS2,256,124,8,8 EDITTEXT IDC_EDIT_LINECOMMENTPOS2,267,122,26,12,ES_AUTOHSCROLL @@ -1127,7 +1127,7 @@ BEGIN WS_VSCROLL | WS_TABSTOP CONTROL "Single line(&\\)",IDC_CHECK_STRINGLINEONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,180,64,10 - CONTROL "Highlight to eol if without end mark(&N)",IDC_CHECK_STRINGENDLINE,"Button",BS_AUTOCHECKBOX | + CONTROL "Highlight to eol if without e&nd mark",IDC_CHECK_STRINGENDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,194,133,10 LTEXT "Vertical Line(&3)",IDC_STATIC,164,218,66,8 EDITTEXT IDC_EDIT_VERTLINE,220,216,74,12,ES_AUTOHSCROLL @@ -1147,27 +1147,27 @@ BEGIN PUSHBUTTON "(&1)...",IDC_BUTTON_HOKANFILE_REF,215,14,19,14 COMBOBOX IDC_COMBO_HOKAN_TYPE,236,15,58,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Case Insensitive(&I)",IDC_CHECK_HOKANLOHICASE, + CONTROL "Case &Insensitive",IDC_CHECK_HOKANLOHICASE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,31,90,10 LTEXT "Candidate�F",IDC_STATIC,102,32,30,8,NOT WS_GROUP - CONTROL "In current file(&F)",IDC_CHECK_HOKANBYFILE,"Button", + CONTROL "In current &file",IDC_CHECK_HOKANBYFILE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,142,31,68,10 - CONTROL "From Keyword Set(&K)",IDC_CHECK_HOKANBYKEYWORD,"Button", + CONTROL "From &Keyword Set",IDC_CHECK_HOKANBYKEYWORD,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,212,31,80,10 GROUPBOX "Input Auto-complete Support",IDC_STATIC,3,3,295,45,WS_GROUP - GROUPBOX "External Help Setup(&L)",IDC_STATIC,3,55,295,32,WS_GROUP + GROUPBOX "Externa&l Help Setup",IDC_STATIC,3,55,295,32,WS_GROUP EDITTEXT IDC_EDIT_TYPEEXTHELP,8,68,264,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "(&2)...",IDC_BUTTON_TYPEOPENHELP,275,67,19,14 - GROUPBOX "External HTML Help Setup(&P)",IDC_STATIC,3,95,295,45, + GROUPBOX "External HTML Hel&p Setup",IDC_STATIC,3,95,295,45, WS_GROUP EDITTEXT IDC_EDIT_TYPEEXTHTMLHELP,8,109,264,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "(&3)...",IDC_BUTTON_TYPEOPENEXTHTMLHELP,275,107,19,14 - CONTROL "Dont open multiple viewers(&N)", + CONTROL "Do&nt open multiple viewers", IDC_CHECK_TYPEHTMLHELPISSINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,125,109,10 - CONTROL "Check CR consistence when save(&E)",IDC_CHECK_CHKENTERATEND, + CONTROL "Ch&eck CR consistence when save",IDC_CHECK_CHKENTERATEND, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,145,146,10 CONTROL "Ignore char in strings(&S)",IDC_CHECK_INDENTCPPSTR, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,171,146,10 @@ -1183,12 +1183,12 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Use Regex Keywords(&R)",IDC_CHECK_REGEX, + CONTROL "Use &Regex Keywords",IDC_CHECK_REGEX, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,5,5, 124,10 RTEXT "BREGONIG.DLL Version",IDC_LABEL_REGEX_VERSION,89,15,208, 10,NOT WS_GROUP,WS_EX_TRANSPARENT - GROUPBOX "Regex Keyword(&K)",IDC_FRAME_REGEX,3,24,295,169 + GROUPBOX "Regex &Keyword",IDC_FRAME_REGEX,3,24,295,169 CONTROL "List5",IDC_LIST_REGEX,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | @@ -1196,21 +1196,21 @@ BEGIN RTEXT "Regex(&N)",IDC_LABEL_REGEX_KEYWORD,10,157,44,8,NOT WS_GROUP EDITTEXT IDC_EDIT_REGEX,59,155,191,14,ES_AUTOHSCROLL - RTEXT "Colorization(&C)",IDC_LABEL_REGEX_COLOR,10,174,44,8,NOT + RTEXT "&Colorization",IDC_LABEL_REGEX_COLOR,10,174,44,8,NOT WS_GROUP COMBOBOX IDC_COMBO_REGEX_COLOR,59,172,128,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Insert(&S)",IDC_BUTTON_REGEX_INS,255,118,38,15 - PUSHBUTTON "Append(&A)",IDC_BUTTON_REGEX_ADD,255,136,38,15 - PUSHBUTTON "Edit(&E)",IDC_BUTTON_REGEX_UPD,255,154,38,15 - PUSHBUTTON "Delete(&D)",IDC_BUTTON_REGEX_DEL,255,172,38,15 - PUSHBUTTON "Top(&T)",IDC_BUTTON_REGEX_TOP,255,33,38,15 - PUSHBUTTON "Up(&U)",IDC_BUTTON_REGEX_UP,255,51,38,15 + PUSHBUTTON "In&sert",IDC_BUTTON_REGEX_INS,255,118,38,15 + PUSHBUTTON "&Append",IDC_BUTTON_REGEX_ADD,255,136,38,15 + PUSHBUTTON "&Edit",IDC_BUTTON_REGEX_UPD,255,154,38,15 + PUSHBUTTON "&Delete",IDC_BUTTON_REGEX_DEL,255,172,38,15 + PUSHBUTTON "&Top",IDC_BUTTON_REGEX_TOP,255,33,38,15 + PUSHBUTTON "&Up",IDC_BUTTON_REGEX_UP,255,51,38,15 PUSHBUTTON "Down(&G)",IDC_BUTTON_REGEX_DOWN,255,69,38,15 PUSHBUTTON "Last(&B)",IDC_BUTTON_REGEX_LAST,255,87,38,15 - PUSHBUTTON "Import(&I)...",IDC_BUTTON_REGEX_IMPORT,173,196,60, + PUSHBUTTON "&Import...",IDC_BUTTON_REGEX_IMPORT,173,196,60, 14,WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_REGEX_EXPORT,236,196,60, + PUSHBUTTON "E&xport...",IDC_BUTTON_REGEX_EXPORT,236,196,60, 14 LTEXT "If you specify [URL] in the [Colorize] field then the matched text will become clickable.", IDC_STATIC,14,195,138,29 @@ -1221,10 +1221,10 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Use Keyword Help(&K)",IDC_CHECK_KEYHELP, + CONTROL "Use &Keyword Help",IDC_CHECK_KEYHELP, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,5,6, 114,10 - GROUPBOX "Dictonary File List(&L)",IDC_FRAME_KEYHELP,3,21,295,174 + GROUPBOX "Dictonary File &List",IDC_FRAME_KEYHELP,3,21,295,174 CONTROL "List5",IDC_LIST_KEYHELP,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | @@ -1239,21 +1239,21 @@ BEGIN PUSHBUTTON "...",IDC_BUTTON_KEYHELP_REF,234,172,12,13,WS_GROUP LTEXT "�� Priority (Top)",IDC_LABEL_KEYHELP_PRIOR,249,33,44,8,NOT WS_GROUP - PUSHBUTTON "Insert(&S)",IDC_BUTTON_KEYHELP_INS,251,136,38,15 - PUSHBUTTON "Update(&E)",IDC_BUTTON_KEYHELP_UPD,251,154,38,15 - PUSHBUTTON "Delete(&D)",IDC_BUTTON_KEYHELP_DEL,251,172,38,15 - PUSHBUTTON "Top(&T)",IDC_BUTTON_KEYHELP_TOP,251,44,38,15 - PUSHBUTTON "Up(&U)",IDC_BUTTON_KEYHELP_UP,251,62,38,15 + PUSHBUTTON "In&sert",IDC_BUTTON_KEYHELP_INS,251,136,38,15 + PUSHBUTTON "Updat&e",IDC_BUTTON_KEYHELP_UPD,251,154,38,15 + PUSHBUTTON "&Delete",IDC_BUTTON_KEYHELP_DEL,251,172,38,15 + PUSHBUTTON "&Top",IDC_BUTTON_KEYHELP_TOP,251,44,38,15 + PUSHBUTTON "&Up",IDC_BUTTON_KEYHELP_UP,251,62,38,15 PUSHBUTTON "Down(&G)",IDC_BUTTON_KEYHELP_DOWN,251,80,38,15 PUSHBUTTON "Last(&B)",IDC_BUTTON_KEYHELP_LAST,251,98,38,15 - PUSHBUTTON "Import(&I)...",IDC_BUTTON_KEYHELP_IMPORT,173,199,60, + PUSHBUTTON "&Import...",IDC_BUTTON_KEYHELP_IMPORT,173,199,60, 14,WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_KEYHELP_EXPORT,236,199, + PUSHBUTTON "E&xport...",IDC_BUTTON_KEYHELP_EXPORT,236,199, 60,14 - CONTROL "Cont. searching other dict.(&A)", + CONTROL "Cont. se&arching other dict.", IDC_CHECK_KEYHELP_ALLSEARCH,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,200,105,10 - CONTROL "Also show KeyWord(&W)",IDC_CHECK_KEYHELP_KEYDISP, + CONTROL "Also show Key&Word",IDC_CHECK_KEYHELP_KEYDISP, "Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,212, 95,10 CONTROL "Search within selection(&P)",IDC_CHECK_KEYHELP_PREFIX, @@ -1266,30 +1266,30 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "Tahoma" BEGIN LTEXT "Input Mode",IDC_STATIC,5,6,40,8 - LTEXT "CR Code(&E)",IDC_STATIC,15,34,46,8 + LTEXT "CR Cod&e",IDC_STATIC,15,34,46,8 COMBOBOX IDC_COMBO_DEFAULT_EOLTYPE,57,32,52,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&BOM",IDC_CHECK_DEFAULT_BOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,33,30,10 - LTEXT "Encoding(&C)",IDC_STATIC,8,49,46,8 + LTEXT "En&coding",IDC_STATIC,8,49,46,8 COMBOBOX IDC_COMBO_DEFAULT_CODETYPE,57,47,52,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 114,48,25,10 - CONTROL "Give Priority to CESU-8 at Auto-Detection(&U)", + CONTROL "Give Priority to CES&U-8 at Auto-Detection", IDC_CHECK_PRIOR_CESU8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,63,135,10 GROUPBOX "Default Encoding",IDC_STATIC,3,22,145,58 LTEXT "ON/OFF(&M)",IDC_STATIC,189,34,55,8 COMBOBOX IDC_COMBO_IMESWITCH,232,32,61,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "IME Input Mode(&D)",IDC_STATIC,164,49,75,8 + LTEXT "IME Input Mo&de",IDC_STATIC,164,49,75,8 COMBOBOX IDC_COMBO_IMESTATE,232,47,61,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "IME State at Editor Startup",IDC_STATIC,153,22,145,58 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,5,88,293,1 LTEXT "Window Setting",IDC_STATIC,5,96,36,8 - CONTROL "Use Document Icon(&O)",IDC_CHECK_DOCICON,"Button", + CONTROL "Use D&ocument Icon",IDC_CHECK_DOCICON,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,107,86,10 CONTROL "Layout(&R)",IDC_RADIO_LINENUM_LAYOUT,"Button", BS_AUTORADIOBUTTON | WS_GROUP,8,134,60,10 @@ -1300,13 +1300,13 @@ BEGIN CONTROL "Spin3",IDC_SPIN_LINENUMWIDTH,"msctls_updown32", UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_AUTOBUDDY,61,163,9,12 GROUPBOX "Line nr. Display",IDC_STATIC,4,122,70,59,WS_GROUP - CONTROL "None(&N)",IDC_RADIO_LINETERMTYPE0,"Button", + CONTROL "&None",IDC_RADIO_LINETERMTYPE0,"Button", BS_AUTORADIOBUTTON | WS_GROUP,83,134,39,10 - CONTROL "Vertical Line(&V)",IDC_RADIO_LINETERMTYPE1,"Button", + CONTROL "&Vertical Line",IDC_RADIO_LINETERMTYPE1,"Button", BS_AUTORADIOBUTTON,83,149,61,10 CONTROL "Other(&Y)",IDC_RADIO_LINETERMTYPE2,"Button", BS_AUTORADIOBUTTON,83,164,41,10 - LTEXT "HH-Spacer(&S)",IDC_LABEL_LINETERMCHAR,83,178,46,8 + LTEXT "HH-&Spacer",IDC_LABEL_LINETERMCHAR,83,178,46,8 EDITTEXT IDC_EDIT_LINETERMCHAR,129,177,15,12,ES_AUTOHSCROLL GROUPBOX "Line nr. Delimiter",IDC_STATIC,78,122,70,80 @@ -1381,17 +1381,17 @@ FONT 9, "Tahoma" BEGIN LTEXT "Color",IDC_STATIC,7,13,24,8 LTEXT "Static",IDC_STATIC_COLOR,35,10,86,14,SS_CENTERIMAGE - LTEXT "Check (&C) colors to consolidate on.", + LTEXT "&Check colors to consolidate on.", IDC_STATIC,7,29,166,8 LISTBOX IDC_LIST_COLORS,7,41,114,90,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Check All(&A)",IDC_BUTTON_SELALL,125,70,49,14 - PUSHBUTTON "Check None(&N)",IDC_BUTTON_SELNOTING,125,89,49,14 + PUSHBUTTON "Check &All",IDC_BUTTON_SELALL,125,70,49,14 + PUSHBUTTON "Check &None",IDC_BUTTON_SELNOTING,125,89,49,14 LISTBOX IDC_LIST_ITEMINFO,7,143,114,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL DEFPUSHBUTTON "&OK",IDOK,15,185,49,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,67,185,49,14 - PUSHBUTTON "Help(&H)",IDC_BUTTON_HELP,119,185,49,14 + PUSHBUTTON "&Help",IDC_BUTTON_HELP,119,185,49,14 END IDD_PROP_GENERAL DIALOGEX 0, 0, 293, 240 @@ -1401,17 +1401,17 @@ EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN GROUPBOX "Cursor",IDC_STATIC,3,3,149,84 - CONTROL "Free Cursor(&F)",IDC_CHECK_FREECARET,"Button", + CONTROL "&Free Cursor",IDC_CHECK_FREECARET,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,14,120,10 - CONTROL "When moving between words\nstop at each boundary(&B)", + CONTROL "When moving &between words\nstop at each boundary", IDC_CHECK_STOPS_BOTH_ENDS_WHEN_SEARCH_WORD,"Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,8, 26,120,19 - CONTROL "When moving between paragraphs\nstop on each boundary(&P)", + CONTROL "When moving between ¶graphs\nstop on each boundary", IDC_CHECK_STOPS_BOTH_ENDS_WHEN_SEARCH_PARAGRAPH,"Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,8, 46,120,19 - CONTROL "Clicking on the window to gain focus\ndoes not move the cursor(&O)", + CONTROL "Clicking &on the window to gain focus\ndoes not move the cursor", IDC_CHECK_NOMOVE_ACTIVATE_BY_MOUSE,"Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,8, 66,133,19 @@ -1421,15 +1421,15 @@ BEGIN CONTROL "MS-&DOS Style",IDC_RADIO_CARETTYPE1,"Button", BS_AUTORADIOBUTTON,69,99,61,10 GROUPBOX "Task Tray",IDC_STATIC,3,115,149,71,WS_GROUP - CONTROL "Use Task Tray(&T)",IDC_CHECK_USETRAYICON,"Button", + CONTROL "Use &Task Tray",IDC_CHECK_USETRAYICON,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,127,81,10 - CONTROL "Stay Resident in Task Tray(&R)",IDC_CHECK_STAYTASKTRAY,"Button", + CONTROL "Stay &Resident in Task Tray",IDC_CHECK_STAYTASKTRAY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,141,104,10 - LTEXT "Put short cut in Right-Click(Context) Menu(&K)",IDC_STATIC, + LTEXT "Put short cut in Right-Clic&k(Context) Menu",IDC_STATIC, 8,157,131,8 CONTROL "HotKey1",IDC_HOTKEY_TRAYMENU,"msctls_hotkey32", WS_BORDER | WS_TABSTOP,8,167,95,12 - CONTROL "Confirm when closing\nmUltiple editor windows(&U)", + CONTROL "Confirm when closing\nm&ultiple editor windows", IDC_CHECK_CLOSEALLCONFIRM,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,8,193,124, 19 @@ -1437,19 +1437,19 @@ BEGIN IDC_CHECK_EXITCONFIRM,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_GROUP | WS_TABSTOP,8,212,124,19 GROUPBOX "Scroll",IDC_STATIC,158,3,130,125,WS_GROUP - LTEXT "Line Numbers(&N)",IDC_STATIC,163,19,29,8,NOT WS_GROUP + LTEXT "Line &Numbers",IDC_STATIC,163,19,29,8,NOT WS_GROUP EDITTEXT IDC_EDIT_REPEATEDSCROLLLINENUM,196,17,40,12, ES_AUTOHSCROLL | WS_GROUP CONTROL "Spin3",IDC_SPIN_REPEATEDSCROLLLINENUM,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,236,17,9, 12 - CONTROL "Very Smooth(&S)",IDC_CHECK_REPEATEDSCROLLSMOOTH, + CONTROL "Very &Smooth",IDC_CHECK_REPEATEDSCROLLSMOOTH, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,33,80,10 LTEXT "Mouse wheel vertical page \nscroll behavior is(&J)", IDC_STATIC,163,49,110,16,NOT WS_GROUP COMBOBOX IDC_COMBO_WHEEL_PAGESCROLL,178,67,85,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Mouse wheel horizontal page \nscroll behavior is(&H)", + LTEXT "Mouse wheel &horizontal page \nscroll behavior is", IDC_STATIC,163,88,111,16,NOT WS_GROUP COMBOBOX IDC_COMBO_WHEEL_HSCROLL,178,108,85,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -1463,7 +1463,7 @@ BEGIN CONTROL "Spin1",IDC_SPIN_MAX_MRU_FILE,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,178,9, 12 - PUSHBUTTON "Clear History(&C)...",IDC_BUTTON_CLEAR_MRU_FILE,208,177, + PUSHBUTTON "&Clear History...",IDC_BUTTON_CLEAR_MRU_FILE,208,177, 61,14 LTEXT "Ma&ximum Folder History",IDC_STATIC,163,200,74,8 EDITTEXT IDC_EDIT_MAX_MRU_FOLDER,168,211,28,12,ES_AUTOHSCROLL | @@ -1471,7 +1471,7 @@ BEGIN CONTROL "Spin1",IDC_SPIN_MAX_MRU_FOLDER,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,211,9, 12 - PUSHBUTTON "Clear History(&L)...",IDC_BUTTON_CLEAR_MRU_FOLDER,208, + PUSHBUTTON "C&lear History...",IDC_BUTTON_CLEAR_MRU_FOLDER,208, 210,61,14 END @@ -1481,34 +1481,34 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Show Toolbar(&T)",IDC_CHECK_DispTOOLBAR,"Button", + CONTROL "Show &Toolbar",IDC_CHECK_DispTOOLBAR,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,13,76,10 - CONTROL "Show Function Key(&K)",IDC_CHECK_DispFUNCKEYWND, + CONTROL "Show Function &Key",IDC_CHECK_DispFUNCKEYWND, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,25,96,10 - CONTROL "Show Status Bar(&S)",IDC_CHECK_DispSTATUSBAR,"Button", + CONTROL "&Show Status Bar",IDC_CHECK_DispSTATUSBAR,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,37,88,10 - CONTROL "Horizontal Scrollbar(&R)",IDC_CHECK_bScrollBarHorz,"Button", + CONTROL "Horizontal Scrollba&r",IDC_CHECK_bScrollBarHorz,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,104,13,89,10 - CONTROL "Menu Icon(&I)",IDC_CHECK_bMenuIcon,"Button", + CONTROL "Menu &Icon",IDC_CHECK_bMenuIcon,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,195,13,87,10 - PUSHBUTTON "(&W)indow pos && size...",IDC_BUTTON_WINSIZE,202,33,83, + PUSHBUTTON "&Window pos && size...",IDC_BUTTON_WINSIZE,202,33,83, 14 LTEXT "NB: Tab-Bar display\nis in the tab bar tab",IDC_STATIC, 111,30,83,17 GROUPBOX "Basic Settings",IDC_STATIC,3,3,285,49,WS_GROUP - LTEXT "Ruler Height(&E)",IDC_STATIC,7,68,58,8 + LTEXT "Ruler H&eight",IDC_STATIC,7,68,58,8 EDITTEXT IDC_EDIT_nRulerHeight,101,66,28,12,ES_AUTOHSCROLL CONTROL "Spin1",IDC_SPIN_nRulerHeight,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,124,66,10, 12 LTEXT "dots",IDC_STATIC,133,68,17,8 - LTEXT "Ruler and Text spacing(&P)",IDC_STATIC,7,81,91,8 + LTEXT "Ruler and Text s&pacing",IDC_STATIC,7,81,91,8 EDITTEXT IDC_EDIT_nRulerBottomSpace,101,80,28,12,ES_AUTOHSCROLL CONTROL "Spin1",IDC_SPIN_nRulerBottomSpace,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,124,79,10, 12 LTEXT "dots",IDC_STATIC,133,81,17,8 - LTEXT "Line number and Text spacing(&L)",IDC_STATIC,7,96,86,8 + LTEXT "&Line number and Text spacing",IDC_STATIC,7,96,86,8 EDITTEXT IDC_EDIT_nLineNumberRightSpace,101,94,28,12, ES_AUTOHSCROLL CONTROL "Spin1",IDC_SPIN_nLineNumberRightSpace,"msctls_updown32", @@ -1516,19 +1516,19 @@ BEGIN 12 LTEXT "dots",IDC_STATIC,133,96,17,8 GROUPBOX "Ruler / Line Numbering",IDC_STATIC,3,56,153,54 - CONTROL "Sync'd to vertical scroll(&V)", + CONTROL "Sync'd to &vertical scroll", IDC_CHECK_SplitterWndVScroll,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,126,115,10 - CONTROL "Sync'd to horizontal scroll(&H)", + CONTROL "Sync'd to &horizontal scroll", IDC_CHECK_SplitterWndHScroll,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,139,116,10 GROUPBOX "Split Window",IDC_STATIC,3,114,153,39,WS_GROUP LTEXT "Pos",IDC_STATIC,167,68,16,8 - CONTROL "Top(&O)",IDC_RADIO_FUNCKEYWND_PLACE1,"Button", + CONTROL "T&op",IDC_RADIO_FUNCKEYWND_PLACE1,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,191,68,44,10 - CONTROL "Bottom(&B)",IDC_RADIO_FUNCKEYWND_PLACE2,"Button", + CONTROL "&Bottom",IDC_RADIO_FUNCKEYWND_PLACE2,"Button", BS_AUTORADIOBUTTON,237,68,44,10 - LTEXT "Group Button nr.(&G)",IDC_STATIC,167,81,67,10 + LTEXT "&Group Button nr.",IDC_STATIC,167,81,67,10 EDITTEXT IDC_EDIT_FUNCKEYWND_GROUPNUM,236,80,28,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "Spin1",IDC_SPIN_FUNCKEYWND_GROUPNUM,"msctls_updown32", @@ -1553,13 +1553,13 @@ BEGIN RTEXT "Category(&K)",IDC_LABEL_MENUFUNCKIND,4,4,51,8 COMBOBOX IDC_COMBO_FUNCKIND,56,2,80,170,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Function(&F)",IDC_LABEL_MENUFUNC,3,15,40,8 + LTEXT "&Function",IDC_LABEL_MENUFUNC,3,15,40,8 LISTBOX IDC_LIST_FUNC,3,25,123,199,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - CONTROL "Flat Button Style(&L)",IDC_CHECK_TOOLBARISFLAT,"Button", + CONTROL "F&lat Button Style",IDC_CHECK_TOOLBARISFLAT,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,202,2,73,10 - LTEXT "Toolbar(&T)",IDC_LABEL_TOOLBAR,164,15,46,8 + LTEXT "&Toolbar",IDC_LABEL_TOOLBAR,164,15,46,8 LISTBOX IDC_LIST_RES,164,25,123,199,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP @@ -1580,27 +1580,27 @@ FONT 9, "Tahoma" BEGIN CONTROL "Show Tab bar(&D)",IDC_CHECK_DispTabWnd,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,11,111,10 - CONTROL "Tab-Group uses common window(&B)", + CONTROL "Ta&b-Group uses common window", IDC_CHECK_DispTabWndMultiWin,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,239,10 - CONTROL "After closing last document, open a new blank document(&R)", + CONTROL "Afte&r closing last document, open a new blank document", IDC_CHECK_RetainEmptyWindow,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,53,226,10 - CONTROL "Closing main window closes only the active file(&C)", + CONTROL "&Closing main window closes only the active file", IDC_CHECK_CloseOneWin,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,66,226,10 - CONTROL "Open in New Window when start from outside(&O)", + CONTROL "&Open in New Window when start from outside", IDC_CHECK_OpenNewWin,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,79,170,10 GROUPBOX "Automatic Mode",IDC_STATIC,7,27,280,68 CONTROL "Display &Icons",IDC_CHECK_DispTabIcon,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,115,53,10 - CONTROL "Fixed Width(&E)",IDC_CHECK_SameTabWidth,"Button", + CONTROL "Fix&ed Width",IDC_CHECK_SameTabWidth,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,70,115,59,10 LTEXT "Close Btn(&X)",IDC_TextTabClose,133,116,68,8 COMBOBOX IDC_CHECK_DispTabClose,176,113,46,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Font(&F)...",IDC_BUTTON_TABFONT,232,113,51,14 + PUSHBUTTON "&Font...",IDC_BUTTON_TABFONT,232,113,51,14 RTEXT "Font", IDC_STATIC_TABFONT,102,127,180,17,SS_RIGHT CONTROL "&Sort Tab List",IDC_CHECK_SortTabList,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,129,85,10 @@ -1609,10 +1609,10 @@ BEGIN RTEXT "&Position",IDC_TAB_POSITION,80,142,40,8 COMBOBOX IDC_COMBO_TAB_POSITION,124,140,46,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Title(&T)",IDC_TextTabCaption,15,160,40,10 + LTEXT "&Title",IDC_TextTabCaption,15,160,40,10 EDITTEXT IDC_TABWND_CAPTION,56,157,226,14,ES_AUTOHSCROLL GROUPBOX "Apperance of Tabs",IDC_STATIC,7,102,280,76,WS_GROUP - CONTROL "Change tabs using mouse Wheel(&W)",IDC_CHECK_ChgWndByWheel, + CONTROL "Change tabs using mouse &Wheel",IDC_CHECK_ChgWndByWheel, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,196,127,10 GROUPBOX "Misc",IDC_STATIC,7,184,280,28,WS_GROUP END @@ -1624,23 +1624,23 @@ EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN GROUPBOX "Character Code",IDC_STATIC,3,3,285,92 - CONTROL "Display Character Code by Unicode when using SJIS, Latin1(&S)", + CONTROL "Display Character Code by Unicode when using &SJIS, Latin1", IDC_CHECK_DISP_UNICODE_IN_SJIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,16,205,10 - CONTROL "Display Character Code by Unicode when using JIS(&J)", + CONTROL "Display Character Code by Unicode when using &JIS", IDC_CHECK_DISP_UNICODE_IN_JIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,32,205,10 - CONTROL "Display Character Code by Unicode when using EUC(&E)", + CONTROL "Display Character Code by Unicode when using &EUC", IDC_CHECK_DISP_UNICODE_IN_EUC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,205,10 - CONTROL "Display Code Point when using UTF-8, CESU-8(&8)", + CONTROL "Display Code Point when using UTF-8, CESU-&8", IDC_CHECK_DISP_UTF8_CODEPOINT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,205,10 - CONTROL "Display Code Point for Surrogate Pair(&P)", + CONTROL "Display Code Point for Surrogate &Pair", IDC_CHECK_DISP_SP_CODEPOINT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,80,205,10 GROUPBOX "Character Count",IDC_STATIC,3,98,285,47 - CONTROL "Display Character Count by Bytes(&B) * HIGH LOAD", + CONTROL "Display Character Count by &Bytes * HIGH LOAD", IDC_CHECK_DISP_SELCOUNT_BY_BYTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,112,274,10 CONTROL "Display Column by Character Count(&C)", @@ -1657,29 +1657,29 @@ BEGIN CONTROL "Insert &CR when line-wraps in copied text", IDC_CHECK_ADDCRLFWHENCOPY,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,16,143,10 - CONTROL "Cancel selection after copying(&R)", + CONTROL "Cancel selection afte&r copying", IDC_CHECK_COPYnDISABLESELECTEDAREA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,29,143,10 CONTROL "Selectionless copy copies current lin&e", IDC_CHECK_bEnableNoSelectCopy,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,42,143,10 - CONTROL "Pasting a (&L)ine pastes at start of line", + CONTROL "Pasting a &Line pastes at start of line", IDC_CHECK_bEnableLineModePaste,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,55,143,10 - CONTROL "Pasting Lines with CR Conversion(&P)", + CONTROL "&Pasting Lines with CR Conversion", IDC_CHECK_CONVERTEOLPASTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,68,143,10 GROUPBOX "Copy",IDC_STATIC,3,3,149,81,WS_GROUP - CONTROL "Drag'n'Drop editing(&D)",IDC_CHECK_DRAGDROP, + CONTROL "&Drag'n'Drop editing",IDC_CHECK_DRAGDROP, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,104, 143,10 - CONTROL "Allow other tools to drop(&S)",IDC_CHECK_DROPSOURCE,"Button", + CONTROL "Allow other tool&s to drop",IDC_CHECK_DROPSOURCE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,117,143,10 GROUPBOX "Drag'n'Drop",IDC_STATIC,3,91,149,43,WS_GROUP - CONTROL "Dont overwrite existing line-breaks(&N)", + CONTROL "Do&nt overwrite existing line-breaks", IDC_CHECK_bNotOverWriteCRLF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,156,143,10 - CONTROL "Fill Space when Overrite 2-bytes by 1-byte(&F)", + CONTROL "&Fill Space when Overrite 2-bytes by 1-byte", IDC_CHECK_bOverWriteFixMode,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,169,143,10 CONTROL "Delete selecting area while box selecting(&G)", @@ -1689,11 +1689,11 @@ BEGIN CONTROL "Clicking selects whole &URL",IDC_CHECK_bSelectClickedURL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,18,120,10 GROUPBOX "URL Selection",IDC_STATIC,156,3,131,35,WS_GROUP - CONTROL "Cur Folder(&U)",IDC_RADIO_CURDIR,"Button", + CONTROL "C&urrent Folder",IDC_RADIO_CURDIR,"Button", BS_AUTORADIOBUTTON,161,54,90,8 CONTROL "Recently Used Folder(&M)",IDC_RADIO_MRUDIR,"Button", BS_AUTORADIOBUTTON,161,69,90,8 - CONTROL "Specific Folder(&F)",IDC_RADIO_SELDIR,"Button", + CONTROL "Specific &Folder",IDC_RADIO_SELDIR,"Button", BS_AUTORADIOBUTTON,161,84,90,8 EDITTEXT IDC_EDIT_FILEOPENDIR,161,100,111,12,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_BUTTON_FILEOPENDIR,273,100,9,12 @@ -1723,14 +1723,14 @@ BEGIN EDITTEXT IDC_EDIT_AUTOLOAD_DELAY,130,30,30,12 CONTROL "Spin1",IDC_SPIN_AUTOLOAD_DELAY,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,150,30,9,12 - CONTROL "Forbid Editing when Detecting Read-Only(&N)", + CONTROL "Forbid Editi&ng when Detecting Read-Only", IDC_CHECK_bUneditableIfUnwritable,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,46,154,10 GROUPBOX "Exclusive File Control",IDC_STATIC,3,3,163,57,WS_GROUP - CONTROL "Save even if there're no changes(&S)", + CONTROL "&Save even if there're no changes", IDC_CHECK_ENABLEUNMODIFIEDOVERWRITE,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,175,16,111,10 - CONTROL "Automatically save(&U)",IDC_CHECK_AUTOSAVE,"Button", + CONTROL "A&utomatically save",IDC_CHECK_AUTOSAVE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,175,31,84,10 LTEXT "&Interval is every",IDC_LABEL_AUTOSAVE,186,47,31,8,NOT WS_GROUP EDITTEXT IDC_EDIT_AUTOBACKUP_INTERVAL,219,45,30,12 @@ -1741,12 +1741,12 @@ BEGIN CONTROL "Display all file types for new file(&O)", IDC_CHECK_NoFilterSaveNew,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,77,133,10 - CONTROL "Display all file types for saved file(&F)", + CONTROL "Display all &file types for saved file", IDC_CHECK_NoFilterSaveFile,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,77,142,10 GROUPBOX "File List display filter for file-dialog", IDC_STATIC,3,65,285,28 - CONTROL "Close existing file when drag'n'drop new one(&L)", + CONTROL "C&lose existing file when drag'n'drop new one", IDC_CHECK_bDropFileAndClose,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,110,149,10 LTEXT "Support upto &MAX",IDC_LABEL_AUTOSAVE3,18, @@ -1759,22 +1759,22 @@ BEGIN WS_GROUP LTEXT "NB: Only possible to drop 1 file",IDC_LANEL_NOTE,161, 111,106,8 - CONTROL "Restor cursor position on open file(&C)", + CONTROL "Restor &cursor position on open file", IDC_CHECK_RestoreCurPosition,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,140,174,10 - CONTROL "Restore bookmarks on file open(&B)", + CONTROL "Restore &bookmarks on file open", IDC_CHECK_RestoreBookmarks,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,155,214,10 - CONTROL "Decode MIME headers on file open(&D)", + CONTROL "&Decode MIME headers on file open", IDC_CHECK_AutoMIMEDecode,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,169,231,10 CONTROL "Display a dialog if char. encoding changes(&Q)", IDC_CHECK_QueryIfCodeChange,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,182,223,13 - CONTROL "Alert if file does not Exist(&E)", + CONTROL "Al&ert if file does not Exist", IDC_CHECK_AlertIfFileNotExist,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,198,223,10 - CONTROL "Alert if file is overly large(&T)", + CONTROL "Aler&t if file is overly large", IDC_CHECK_ALERT_IF_LARGEFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,214,167,10 EDITTEXT IDC_EDIT_ALERT_FILESIZE,181,212,30,12,ES_AUTOHSCROLL @@ -1796,15 +1796,15 @@ BEGIN 100,10 LTEXT "Chars(&N)",IDC_STATIC,109,4,45,10 EDITTEXT IDC_EDIT_SHORTMAXWIDTH,155,3,30,13,ES_NUMBER - GROUPBOX "Simple Filename Display(&I)",IDC_STATIC,6,20,282,180 + GROUPBOX "S&imple Filename Display",IDC_STATIC,6,20,282,180 CONTROL "List1",IDC_LIST_FNAME,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,35,230,117 - LTEXT "From(&F)",IDC_STATIC,13,161,37,10 + LTEXT "&From",IDC_STATIC,13,161,37,10 EDITTEXT IDC_EDIT_FNAME_FROM,50,160,191,13,ES_AUTOHSCROLL LTEXT "To(&R)",IDC_STATIC,13,180,37,10 EDITTEXT IDC_EDIT_FNAME_TO,50,177,191,13,ES_AUTOHSCROLL - PUSHBUTTON "Insert(&S)",IDC_BUTTON_FNAME_INS,245,123,38,15 + PUSHBUTTON "In&sert",IDC_BUTTON_FNAME_INS,245,123,38,15 PUSHBUTTON "&Add",IDC_BUTTON_FNAME_ADD,245,141,38,15 PUSHBUTTON "&Edit",IDC_BUTTON_FNAME_UPD,245,159,38,15 PUSHBUTTON "&Del",IDC_BUTTON_FNAME_DEL,245,177,38,15 @@ -1821,44 +1821,44 @@ EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN GROUPBOX "Backup Creation",IDC_STATIC,3,3,285,207,WS_GROUP - CONTROL "Create backup during save(&K)",IDC_CHECK_BACKUP, + CONTROL "Create bac&kup during save",IDC_CHECK_BACKUP, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,16, 136,10 - CONTROL "Detailed Settings(&A)",IDC_CHECK_BACKUP_ADVANCED,"Button", + CONTROL "Det&ailed Settings",IDC_CHECK_BACKUP_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,12,32,79,10 EDITTEXT IDC_EDIT_BACKUPFILE,24,44,255,13,ES_AUTOHSCROLL - CONTROL "Save once as .bak(&B)", + CONTROL "Save once as .&bak", IDC_RADIO_BACKUP_TYPE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,66,142,10 CONTROL "Save repeatedly as (.b00�`b98)(&G)", IDC_RADIO_BACKUP_TYPE3,"Button",BS_AUTORADIOBUTTON,12,80, 156,10 - CONTROL "Append backup date/time to file name(&E)", + CONTROL "App&end backup date/time to file name", IDC_RADIO_BACKUP_DATETYPE1,"Button",BS_AUTORADIOBUTTON, 12,106,204,10 - CONTROL "Append backup date/time each time to file name(&U)", + CONTROL "Append back&up date/time each time to file name", IDC_RADIO_BACKUP_DATETYPE2,"Button",BS_AUTORADIOBUTTON, 12,120,230,10 - CONTROL "Retain original extension(&R)",IDC_CHECK_BACKUP_RETAINEXT,"Button", + CONTROL "&Retain original extension",IDC_CHECK_BACKUP_RETAINEXT,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,162,66,96,10 - LTEXT "Number of backups (1-99 &N)",IDC_LABEL_BACKUP_3,22,94,91,8 + LTEXT "&Number of backups (1-99)",IDC_LABEL_BACKUP_3,22,94,91,8 EDITTEXT IDC_EDIT_BACKUP_3,116,92,28,12 CONTROL "Spin1",IDC_SPIN_BACKUP_GENS,"msctls_updown32", UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,154,92,9, 12 - CONTROL "Yr (&Y)",IDC_CHECK_BACKUP_YEAR,"Button", + CONTROL "&Yr",IDC_CHECK_BACKUP_YEAR,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,22,132,35,10 - CONTROL "Mth(&M)",IDC_CHECK_BACKUP_MONTH,"Button",BS_AUTOCHECKBOX | + CONTROL "&Mth",IDC_CHECK_BACKUP_MONTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,132,34,10 - CONTROL "Day(&D)",IDC_CHECK_BACKUP_DAY,"Button",BS_AUTOCHECKBOX | + CONTROL "&Day",IDC_CHECK_BACKUP_DAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,97,132,34,10 - CONTROL "Hr(&H)",IDC_CHECK_BACKUP_HOUR,"Button",BS_AUTOCHECKBOX | + CONTROL "&Hr",IDC_CHECK_BACKUP_HOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,132,34,10 - CONTROL "Min(&I)",IDC_CHECK_BACKUP_MIN,"Button",BS_AUTOCHECKBOX | + CONTROL "M&in",IDC_CHECK_BACKUP_MIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,171,132,31,10 - CONTROL "Sec(&S)",IDC_CHECK_BACKUP_SEC,"Button",BS_AUTOCHECKBOX | + CONTROL "&Sec",IDC_CHECK_BACKUP_SEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,205,132,33,10 LTEXT "",IDC_STATIC,12,60,271,83,NOT WS_VISIBLE @@ -1872,9 +1872,9 @@ BEGIN CONTROL "Create in folder(&P)",IDC_CHECK_BACKUPFOLDER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,148,107,10 - AUTOCHECKBOX "Apply for Files on Removable Media(&L)", IDC_CHECK_BACKUP_FOLDER_RM, + AUTOCHECKBOX "App&ly for Files on Removable Media", IDC_CHECK_BACKUP_FOLDER_RM, 120, 148, 133, 10 - LTEXT "Folder Name(&F)",IDC_LABEL_BACKUP_4,24,162,87,8 + LTEXT "&Folder Name",IDC_LABEL_BACKUP_4,24,162,87,8 EDITTEXT IDC_EDIT_BACKUPFOLDER,73,160,195,12,ES_AUTOHSCROLL PUSHBUTTON "&...",IDC_BUTTON_BACKUP_FOLDER_REF,271,160,9,12 CONTROL "Throw backup file into Recycle Bin(&X)", @@ -1891,9 +1891,9 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Standard(&S)",IDC_RADIO_DFORM_0,"Button",BS_AUTORADIOBUTTON | + CONTROL "&Standard",IDC_RADIO_DFORM_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,18,48,10 - CONTROL "Custom(&C)",IDC_RADIO_DFORM_1,"Button", + CONTROL "&Custom",IDC_RADIO_DFORM_1,"Button", BS_AUTORADIOBUTTON,58,18,48,10 LTEXT "&D:",IDC_LABEL_DFORM,106,19,8,8 EDITTEXT IDC_EDIT_DFORM,115,17,82,12,ES_AUTOHSCROLL @@ -1901,9 +1901,9 @@ BEGIN LTEXT "Example",IDC_STATIC,209,7,27,8,NOT WS_GROUP EDITTEXT IDC_EDIT_DFORM_EX,209,17,77,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP - CONTROL "Standard(&N)",IDC_RADIO_TFORM_0,"Button",BS_AUTORADIOBUTTON | + CONTROL "Sta&ndard",IDC_RADIO_TFORM_0,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,58,48,10 - CONTROL "Custom(&U)",IDC_RADIO_TFORM_1,"Button", + CONTROL "C&ustom",IDC_RADIO_TFORM_1,"Button", BS_AUTORADIOBUTTON,58,58,48,10 LTEXT "&T:",IDC_LABEL_TFORM,106,59,8,8 EDITTEXT IDC_EDIT_TFORM,115,57,82,12,ES_AUTOHSCROLL @@ -1911,10 +1911,10 @@ BEGIN LTEXT "Example",IDC_STATIC,209,47,27,8,NOT WS_GROUP EDITTEXT IDC_EDIT_TFORM_EX,209,57,77,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP - GROUPBOX "Header Numbering(&R)",IDC_STATIC,3,83,283,52,WS_GROUP + GROUPBOX "Header Numbe&ring",IDC_STATIC,3,83,283,52,WS_GROUP EDITTEXT IDC_EDIT_MIDASHIKIGOU,8,95,272,31,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL | WS_GROUP - GROUPBOX "Quotation Character(&Q)",IDC_STATIC,3,140,283,32,WS_GROUP + GROUPBOX "&Quotation Character",IDC_STATIC,3,140,283,32,WS_GROUP EDITTEXT IDC_EDIT_INYOUKIGOU,8,152,270,12,ES_AUTOHSCROLL | WS_GROUP END @@ -1925,23 +1925,23 @@ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Use word at current (&C)ursor position as default", + CONTROL "Use word at ¤t cursor position as default", IDC_CHECK_bCaretTextForSearch,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_GROUP | WS_TABSTOP,8,21,204,10 - CONTROL "Share Search Condition with Editors when Search Up/Down(&I)", + CONTROL "Share Search Cond&ition with Editors when Search Up/Down", IDC_CHECK_INHERIT_KEY_OTHER_VIEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,35,209,10 - LTEXT "Regex Lib name(&L)",IDC_LABEL_REGEXP,8,50,93,10 + LTEXT "Regex &Lib name",IDC_LABEL_REGEXP,8,50,93,10 LTEXT "",IDC_LABEL_REGEXP_VER,8,62,275,14 EDITTEXT IDC_EDIT_REGEXPLIB,110,47,162,13,ES_AUTOHSCROLL GROUPBOX "Search/Replace/Grep",IDC_STATIC,3,7,285,70,WS_GROUP CONTROL "Confirm when exiting GREP results(&V)", IDC_CHECK_bGrepExitConfirm,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,94,130,10 - CONTROL "Display (&R)esults in real time(&R)",IDC_CHECK_GREPREALTIME, + CONTROL "Display &Results in real time",IDC_CHECK_GREPREALTIME, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,106,111,10 GROUPBOX "Grep",IDC_STATIC,3,80,285,42,WS_GROUP - CONTROL "Tag Jump using Enter key(&E)",IDC_CHECK_GTJW_RETURN, + CONTROL "Tag Jump using &Enter key",IDC_CHECK_GTJW_RETURN, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,142, 109,10 CONTROL "Tag Jump using double-click(&W)", @@ -1970,7 +1970,7 @@ BEGIN COMBOBOX IDC_COMBO_FUNCKIND,60,2,80,180,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Function(&F)",IDC_LABEL_MENUFUNC,3,18,41,8 + LTEXT "&Function",IDC_LABEL_MENUFUNC,3,18,41,8 LISTBOX IDC_LIST_FUNC,3,28,124,143,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP LTEXT "Key for assigned function...(&G)",IDC_LABEL_FUNCtoKEY,6, @@ -1978,17 +1978,17 @@ BEGIN LISTBOX IDC_LIST_ASSIGNEDKEYS,3,184,124,33,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Import(&I)...",IDC_BUTTON_IMPORT,171,2,58,14, + PUSHBUTTON "&Import...",IDC_BUTTON_IMPORT,171,2,58,14, WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_EXPORT,231,2,58,14 - LTEXT "Key(&Y)",IDC_LABEL_KEYKIND,164,18,25,8 + PUSHBUTTON "E&xport...",IDC_BUTTON_EXPORT,231,2,58,14 + LTEXT "Ke&y",IDC_LABEL_KEYKIND,164,18,25,8 LISTBOX IDC_LIST_KEY,165,28,124,164,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "&Shift",IDC_CHECK_SHIFT,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,134,38,25,10 CONTROL "&Ctrl",IDC_CHECK_CTRL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,53,25,10 - CONTROL "A&Lt",IDC_CHECK_ALT,"Button",BS_AUTOCHECKBOX | + CONTROL "A<",IDC_CHECK_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,68,25,10 LTEXT "Assigned Key's Function...",IDC_LABEL_KEYtoFUNC,166, 196,120,8 @@ -2006,33 +2006,33 @@ BEGIN RTEXT "Category(&K)",IDC_LABEL_MENUFUNCKIND,4,4,52,8 COMBOBOX IDC_COMBO_FUNCKIND,60,2,80,180,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Function(&F)",IDC_LABEL_MENUFUNC,3,16,40,8,NOT WS_GROUP + LTEXT "&Function",IDC_LABEL_MENUFUNC,3,16,40,8,NOT WS_GROUP LISTBOX IDC_LIST_FUNC,3,27,124,178,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - RTEXT "Select(&C)",IDC_LABEL_MENUCHOICE,187,4,31,8 + RTEXT "Sele&ct",IDC_LABEL_MENUCHOICE,187,4,31,8 COMBOBOX IDC_COMBO_MENU,221,2,68,220,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Menu Name(&N)",IDC_LABEL_MENUNAME,142,16,64,8,NOT + LTEXT "Menu &Name",IDC_LABEL_MENUNAME,142,16,64,8,NOT WS_GROUP EDITTEXT IDC_EDIT_MENUNAME,146,27,109,14,ES_AUTOHSCROLL PUSHBUTTON "Set(&R)",IDC_BUTTON_MENUNAME,258,27,30,14 - LTEXT "Menu(&M)",IDC_LABEL_MENU,142,44,37,8,NOT WS_GROUP + LTEXT "&Menu",IDC_LABEL_MENU,142,44,37,8,NOT WS_GROUP LISTBOX IDC_LIST_RES,164,54,123,151,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "Del(&D)",IDC_BUTTON_DELETE,128,62,34,14,WS_GROUP + PUSHBUTTON "&Del",IDC_BUTTON_DELETE,128,62,34,14,WS_GROUP PUSHBUTTON "---(&S)",IDC_BUTTON_INSERTSEPARATOR,128,81,34,14, BS_MULTILINE PUSHBUTTON "Insert(&A)",IDC_BUTTON_INSERT,128,101,34,14 PUSHBUTTON "Ins. &Bot.",IDC_BUTTON_ADD,128,115,34,14,BS_MULTILINE - PUSHBUTTON "Up(&U)",IDC_BUTTON_UP,128,135,34,14 - PUSHBUTTON "Down(&O)",IDC_BUTTON_DOWN,128,149,34,14 + PUSHBUTTON "&Up",IDC_BUTTON_UP,128,135,34,14 + PUSHBUTTON "D&own",IDC_BUTTON_DOWN,128,149,34,14 LTEXT "Double click item to set hot-key", IDC_LABEL_MENUKEYCHANGE,174,208,114,8 - CONTROL "Display as Sub Menu(&S)",IDC_CHECK_SUBMENU,"Button",BS_AUTOCHECKBOX | + CONTROL "Di&splay as Sub Menu",IDC_CHECK_SUBMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,220,114,8 - PUSHBUTTON "Import(&I)...",IDC_BUTTON_IMPORT,3,208,58,14, + PUSHBUTTON "&Import...",IDC_BUTTON_IMPORT,3,208,58,14, WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_EXPORT,64,208,58,14 + PUSHBUTTON "E&xport...",IDC_BUTTON_EXPORT,64,208,58,14 END IDD_PROP_KEYWORD DIALOGEX 0, 0, 293, 240 @@ -2040,29 +2040,29 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - LTEXT "Name(&N)",IDC_STATIC,3,6,37,8 + LTEXT "&Name",IDC_STATIC,3,6,37,8 COMBOBOX IDC_COMBO_SET,42,3,85,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Make Set...",IDC_BUTTON_ADDSET,181,5,53,14, WS_GROUP PUSHBUTTON "&Remove Set...",IDC_BUTTON_DELSET,236,5,52,14 - GROUPBOX "Keyword Highlighting(&K)",IDC_STATIC,3,20,285,217,WS_GROUP + GROUPBOX "&Keyword Highlighting",IDC_STATIC,3,20,285,217,WS_GROUP CONTROL "List5",IDC_LIST_KEYWORD,"SysListView32",LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,5,30,280,171 - PUSHBUTTON "Add(&A)...",IDC_BUTTON_ADDKEYWORD,8,203,40,14,WS_GROUP - PUSHBUTTON "Edit(&E)...",IDC_BUTTON_EDITKEYWORD,50,203,40,14 - PUSHBUTTON "Delete(&D)",IDC_BUTTON_DELKEYWORD,92,203,40,14 - CONTROL "Match Case(&C)",IDC_CHECK_KEYWORDCASE,"Button", + PUSHBUTTON "&Add...",IDC_BUTTON_ADDKEYWORD,8,203,40,14,WS_GROUP + PUSHBUTTON "&Edit...",IDC_BUTTON_EDITKEYWORD,50,203,40,14 + PUSHBUTTON "&Delete",IDC_BUTTON_DELKEYWORD,92,203,40,14 + CONTROL "Match &Case",IDC_CHECK_KEYWORDCASE,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,8,221,94,10 - PUSHBUTTON "Import(&I)...",IDC_BUTTON_IMPORT,166,220,58,14, + PUSHBUTTON "&Import...",IDC_BUTTON_IMPORT,166,220,58,14, WS_GROUP - PUSHBUTTON "Export(&X)...",IDC_BUTTON_EXPORT,227,220,58,14 + PUSHBUTTON "E&xport...",IDC_BUTTON_EXPORT,227,220,58,14 RTEXT "(Max 100 chr Registered 9999 / 9999)", IDC_STATIC_KEYWORD_COUNT,135,205,142,8 PUSHBUTTON "Rename(&H)",IDC_BUTTON_KEYSETRENAME,130,3,40,14 - PUSHBUTTON "Order(&O)",IDC_BUTTON_KEYCLEAN,104,220,45,14 + PUSHBUTTON "&Order",IDC_BUTTON_KEYCLEAN,104,220,45,14 PUSHBUTTON "OK",IDOK,182,243,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,237,243,50,14 END @@ -2081,26 +2081,26 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,122,15,53,10 GROUPBOX "Input Autocompletion",IDC_STATIC,3,3,285,30,WS_GROUP LTEXT "Candidate Select Key",IDC_STATIC,7,17,45,8 - GROUPBOX "External Help Setting(&L)",IDC_STATIC,3,37,285,32,WS_GROUP + GROUPBOX "Externa&l Help Setting",IDC_STATIC,3,37,285,32,WS_GROUP EDITTEXT IDC_EDIT_EXTHELP1,8,50,253,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "(&1)...",IDC_BUTTON_OPENHELP1,264,49,19,14 - GROUPBOX "External HTML Help Setting(&P)",IDC_STATIC,3,73,285,45, + GROUPBOX "External HTML Hel&p Setting",IDC_STATIC,3,73,285,45, WS_GROUP EDITTEXT IDC_EDIT_EXTHTMLHELP,8,89,253,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "(&2)...",IDC_BUTTON_OPENEXTHTMLHELP,264,88,19,14 - CONTROL "Dont open multiple viewers(&N)", + CONTROL "Do&nt open multiple viewers", IDC_CHECK_HTMLHELPISSINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,105,108,10 GROUPBOX "Keyword Help",IDC_STATIC,3,123,285,33,WS_GROUP RTEXT "Font",IDC_STATIC_KEYWORDHELPFONT,8,136,219,17,SS_RIGHT - PUSHBUTTON "Font(&F)...",IDC_BUTTON_KEYWORDHELPFONT,232,136,51, + PUSHBUTTON "&Font...",IDC_BUTTON_KEYWORDHELPFONT,232,136,51, 14 LTEXT "DLL(&M)",IDC_STATIC,7,172,26,8 EDITTEXT IDC_EDIT_MIGEMO_DLL,36,170,224,12,ES_AUTOHSCROLL | WS_GROUP PUSHBUTTON "(&3)...",IDC_BUTTON_OPENMDLL,264,169,19,14 - LTEXT "Dict(&I)",IDC_STATIC,7,188,25,8 + LTEXT "D&ict",IDC_STATIC,7,188,25,8 EDITTEXT IDC_EDIT_MIGEMO_DICT,36,187,224,12,ES_AUTOHSCROLL PUSHBUTTON "(&4)...",IDC_BUTTON_OPENMDICT,264,187,19,14 GROUPBOX "migemo settings",IDC_STATIC,3,159,285,47,WS_GROUP @@ -2117,28 +2117,28 @@ BEGIN CONTROL "List1",IDC_MACROLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,21,285,148 - LTEXT "Name(&N)",IDC_STATIC,6,179,32,8 + LTEXT "&Name",IDC_STATIC,6,179,32,8 EDITTEXT IDC_MACRONAME,39,176,203,14,ES_AUTOHSCROLL LTEXT "&File",IDC_STATIC,6,194,12,8 COMBOBOX IDC_MACROPATH,39,192,203,130,CBS_DROPDOWN | CBS_SORT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Reload file when Macro is executed(&L)", + CONTROL "Re&load file when Macro is executed", IDC_CHECK_RELOADWHENEXECUTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,211,175,10 LTEXT "Cancel Timeout",IDC_STATIC,185,212,75,8 EDITTEXT IDC_MACROCANCELTIMER,255,209,18,14,ES_AUTOHSCROLL LTEXT "sec",IDC_STATIC,275,212,13,8 LTEXT "AutoRun:",IDC_STATIC,6,225,34,8 - CONTROL "After new/open file(&O)",IDC_CHECK_MacroOnOpened,"Button", + CONTROL "After new/&open file",IDC_CHECK_MacroOnOpened,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,44,224,89,10 CONTROL "After changing &Type",IDC_CHECK_MacroOnTypeChanged,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,135,224,77,10 - CONTROL "Before saving(&S)",IDC_CHECK_MacroOnSave,"Button", + CONTROL "Before &saving",IDC_CHECK_MacroOnSave,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,216,224,69,10 LTEXT "Id:",IDC_STATIC,249,176,8,8 COMBOBOX IDC_COMBO_MACROID,260,174,28,129,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Apply(&A)",IDC_MACRO_REG,250,190,38,14 + PUSHBUTTON "&Apply",IDC_MACRO_REG,250,190,38,14 END IDD_PROP_PLUGIN DIALOGEX 0, 0, 293, 240 @@ -2146,11 +2146,11 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP FONT 9, "Tahoma" BEGIN - CONTROL "Enable Plugin Feature(&E)",IDC_CHECK_PluginEnable,"Button", + CONTROL "&Enable Plugin Feature",IDC_CHECK_PluginEnable,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,6,9,100,10 - PUSHBUTTON "Install ZIP Plugin(&Z)", IDC_PLUGIN_INST_ZIP,192, 6, 96, 14 - PUSHBUTTON "Open Folder(&F)",IDC_PLUGIN_OpenFolder,120,20,70,14 - PUSHBUTTON "Install Plugin(&I)",IDC_PLUGIN_SearchNew,192,20,96,14 + PUSHBUTTON "Install &ZIP Plugin", IDC_PLUGIN_INST_ZIP,192, 6, 96, 14 + PUSHBUTTON "Open &Folder",IDC_PLUGIN_OpenFolder,120,20,70,14 + PUSHBUTTON "&Install Plugin",IDC_PLUGIN_SearchNew,192,20,96,14 LTEXT "Plugin List",IDC_STATIC,4,28,50,8 CONTROL "List1",IDC_PLUGINLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | @@ -2162,9 +2162,9 @@ BEGIN LTEXT "Version",IDC_STATIC,11,190,50,8 LTEXT "",IDC_LABEL_PLUGIN_Version,66,190,100,8 PUSHBUTTON "Distribution Site(&D)",IDC_PLUGIN_URL,186,187,80,14 - PUSHBUTTON "Remove(&R)",IDC_PLUGIN_Remove,6,205,80,14 - PUSHBUTTON "Properties(&P)",IDC_PLUGIN_OPTION,96,205,80,14 - PUSHBUTTON "ReadMe(&M)",IDC_PLUGIN_README,186,205,80,14 + PUSHBUTTON "&Remove",IDC_PLUGIN_Remove,6,205,80,14 + PUSHBUTTON "&Properties",IDC_PLUGIN_OPTION,96,205,80,14 + PUSHBUTTON "Read&Me",IDC_PLUGIN_README,186,205,80,14 END IDD_PROP_MAINMENU DIALOGEX 0, 0, 293, 240 @@ -2176,12 +2176,12 @@ BEGIN RTEXT "Category(&K)", IDC_LABEL_MENUFUNCKIND, 15, 6, 40, 8 COMBOBOX IDC_COMBO_FUNCKIND, 57, 4, 80, 180,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Function(&F)", IDC_LABEL_MENUFUNC, 4, 15, 40, 8 + LTEXT "&Function", IDC_LABEL_MENUFUNC, 4, 15, 40, 8 LISTBOX IDC_LIST_FUNC, 4, 25, 123, 192,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "Display Access Key in ( ) (&P)", + AUTOCHECKBOX "Dis&play Access Key in ( )", IDC_CHECK_KEY_PARENTHESES, 176, 4, 113, 10 - LTEXT "Menu(&M)", IDC_LABEL_MENU, 166, 15, 35, 8 + LTEXT "&Menu", IDC_LABEL_MENU, 166, 15, 35, 8 CONTROL "&Menu", IDC_TREE_RES, "SysTreeView32", WS_TABSTOP | WS_BORDER | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS, @@ -2190,20 +2190,20 @@ BEGIN PUSHBUTTON "&New Node", IDC_BUTTON_INSERT_NODE, 128, 44, 37, 14 PUSHBUTTON "---(&S)", IDC_BUTTON_INSERTSEPARATOR, 128, 58, 37, 14 PUSHBUTTON "Ins Bef.(&Q)", IDC_BUTTON_INSERT, 128, 72, 37, 14 - PUSHBUTTON "Ins Aft.(&A)", IDC_BUTTON_INSERT_A, 128, 86, 37, 14 - PUSHBUTTON "Ins Bot.(&B)", IDC_BUTTON_ADD, 128, 100, 37, 14 - PUSHBUTTON "Up(&U)", IDC_BUTTON_UP, 128, 118, 37, 14 - PUSHBUTTON "Down(&O)", IDC_BUTTON_DOWN, 128, 132, 37, 14 - PUSHBUTTON "Right(&R)", IDC_BUTTON_RIGHT, 128, 146, 37, 14 - PUSHBUTTON "Left(&L)", IDC_BUTTON_LEFT, 128, 160, 37, 14 + PUSHBUTTON "Ins &Aft.", IDC_BUTTON_INSERT_A, 128, 86, 37, 14 + PUSHBUTTON "Ins &Bot.", IDC_BUTTON_ADD, 128, 100, 37, 14 + PUSHBUTTON "&Up", IDC_BUTTON_UP, 128, 118, 37, 14 + PUSHBUTTON "D&own", IDC_BUTTON_DOWN, 128, 132, 37, 14 + PUSHBUTTON "&Right", IDC_BUTTON_RIGHT, 128, 146, 37, 14 + PUSHBUTTON "&Left", IDC_BUTTON_LEFT, 128, 160, 37, 14 PUSHBUTTON "Expand(&H)", IDC_BUTTON_EXPAND, 128, 186, 37, 14 PUSHBUTTON "Collapse(&Z)", IDC_BUTTON_COLLAPSE, 128, 200, 37, 14 - PUSHBUTTON "Import(&I)...", IDC_BUTTON_IMPORT, 4, 222, 58, 14, + PUSHBUTTON "&Import...", IDC_BUTTON_IMPORT, 4, 222, 58, 14, WS_GROUP - PUSHBUTTON "Export(&X)...", IDC_BUTTON_EXPORT, 64, 222, 58, 14 + PUSHBUTTON "E&xport...", IDC_BUTTON_EXPORT, 64, 222, 58, 14 PUSHBUTTON "Validate(&T)", IDC_BUTTON_CHECK, 124, 222, 44, 14 PUSHBUTTON "Erase All(&C)", IDC_BUTTON_CLEAR, 186, 222, 44, 14, WS_GROUP - PUSHBUTTON "Load Default(&E)", IDC_BUTTON_INITIALIZE, 235, 222, 54, 14 + PUSHBUTTON "Load D&efault", IDC_BUTTON_INITIALIZE, 235, 222, 54, 14 END IDD_WINPOSSIZE DIALOGEX 0, 0, 177, 159 @@ -2212,7 +2212,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Window Position and Size" FONT 9, "Tahoma" BEGIN - CONTROL "Default(&D)",IDC_RADIO_WINPOS_DEF,"Button", + CONTROL "&Default",IDC_RADIO_WINPOS_DEF,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,19,61,10 CONTROL "Last Pos&ition",IDC_RADIO_WINPOS_SAVE,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,15,32,52,10 @@ -2232,7 +2232,7 @@ BEGIN BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,79,60,10 CONTROL "Last size(&N)",IDC_RADIO_WINSIZE_SAVE,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,15,91,55,10 - CONTROL "Cus&tom size(&T)",IDC_RADIO_WINSIZE_SET,"Button", + CONTROL "Cus&tom size",IDC_RADIO_WINSIZE_SET,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,15,103,56,10 COMBOBOX IDC_COMBO_WINTYPE,84,74,64,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -2273,16 +2273,16 @@ BEGIN 148, 25, 10, 14,WS_EX_TRANSPARENT CONTROL "Check", IDC_CHECK_PLUGIN_OPTION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 36, 216, 200, 10 - COMBOBOX IDC_COMBO_PLUGIN_OPTION, 36, 214, 183, 30, - CBS_DROPDOWNLIST | CBS_HASSTRINGS| WS_TABSTOP - PUSHBUTTON "ReadMe(&M)", IDC_PLUGIN_README, 49, 234, 50, 14 + COMBOBOX IDC_COMBO_PLUGIN_OPTION, 36, 214, 183, 150, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Read&Me", IDC_PLUGIN_README, 49, 234, 50, 14 DEFPUSHBUTTON "&OK", IDOK, 104, 234, 50, 14 PUSHBUTTON "Cancel(&X)", IDCANCEL, 159, 234, 50, 14 - PUSHBUTTON "Help(&H)", IDC_BUTTON_HELP, 214, 234, 50, 14 + PUSHBUTTON "&Help", IDC_BUTTON_HELP, 214, 234, 50, 14 END IDD_PROFILEMGR DIALOGEX 0, 0, 191, 184 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Profile Maneger" FONT 9, "Tahoma" @@ -2297,7 +2297,7 @@ BEGIN PUSHBUTTON "&New",IDC_BUTTON_PROF_CREATE,125,8,61,14 PUSHBUTTON "&Rename",IDC_BUTTON_PROF_RENAME,125,25,61,14 PUSHBUTTON "&Delete",IDC_BUTTON_PROF_DELETE,125,42,61,14 - PUSHBUTTON "Set De&Fault",IDC_BUTTON_PROF_DEFSET,125,62,61,14 + PUSHBUTTON "Set De&fault",IDC_BUTTON_PROF_DEFSET,125,62,61,14 PUSHBUTTON "&Clear Default",IDC_BUTTON_PROF_DEFCLEAR,125,79,61,14 END @@ -2321,11 +2321,11 @@ BEGIN CONTROL "Folder(&2)",IDC_RADIO_FOLDER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,6,98,56,8 GROUPBOX "Type",IDC_STATIC,1,61,89,50,WS_GROUP - LTEXT "Pa&Th",IDC_STATIC_PATH,3,119,22,10 + LTEXT "Pa&th",IDC_STATIC_PATH,3,119,22,10 EDITTEXT IDC_EDIT_PATH,38,117,122,13,ES_AUTOHSCROLL PUSHBUTTON "&...",IDC_BUTTON_REF2,161,117,10,13 PUSHBUTTON "��(&3)",IDC_BUTTON_PATH_MENU,171,117,21,14 - LTEXT "Lab&El",IDC_STATIC,3,136,32,10 + LTEXT "Lab&el",IDC_STATIC,3,136,32,10 EDITTEXT IDC_EDIT_LABEL,38,134,111,13,ES_AUTOHSCROLL LTEXT "File(&K)",IDC_STATIC_FILE,3,154,32,10 EDITTEXT IDC_EDIT_FILE,38,151,111,13,ES_AUTOHSCROLL @@ -2340,7 +2340,7 @@ BEGIN PUSHBUTTON "Ins Bef(&Q)",IDC_BUTTON_INSERT,156,32,36,14 PUSHBUTTON "Ins &Aft",IDC_BUTTON_INSERT_A,156,46,36,14 PUSHBUTTON "Ins Last(&B)",IDC_BUTTON_ADD,156,60,36,14 - PUSHBUTTON "U&Pdate",IDC_BUTTON_UPDATE,156,74,36,14 + PUSHBUTTON "U&pdate",IDC_BUTTON_UPDATE,156,74,36,14 PUSHBUTTON "Files Ins(&C)...",IDC_BUTTON_FILEADD,133,88,59,14 PUSHBUTTON "Paths Repalce(&N)...",IDC_BUTTON_REPLACE,111,102,81,14 PUSHBUTTON "&Up",IDC_BUTTON_UP,156,140,36,14 @@ -2350,7 +2350,7 @@ BEGIN CONTROL "",IDC_TREE_FL,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,193,17,94,202 - PUSHBUTTON "I&Mport",IDC_BUTTON_IMPORT,5,225,50,14 + PUSHBUTTON "I&mport",IDC_BUTTON_IMPORT,5,225,50,14 PUSHBUTTON "Export(&Y)",IDC_BUTTON_EXPORT,59,225,50,14 DEFPUSHBUTTON "&OK",IDOK,128,225,50,14 PUSHBUTTON "Cancel(&X)",IDCANCEL,183,225,50,14 @@ -3159,9 +3159,9 @@ BEGIN F_TOHANKAKU "Full Height �� Half Height" F_TOZENKAKUKATA "Half Height + Hiragana �� Full/Katakana" F_TOZENKAKUHIRA "Half Height + Katakana �� Full/Hiragana" - F_HANKATATOZENKATA "Half Height Katakana �� Full Katakana" - F_HANKATATOZENHIRA "Half Katakana �� Full Hiragana" - F_TOZENEI "Half Alphabetic �� Full Alphabetic" + F_HANKATATOZENKATA "Half Height Katakana �� Full Katakana" + F_HANKATATOZENHIRA "Half Katakana �� Full Hiragana" + F_TOZENEI "Half Alphabetic �� Full Alphabetic" END STRINGTABLE DISCARDABLE @@ -3602,13 +3602,13 @@ BEGIN STR_DLGFAV_ADD_PROMPT "Please enter a string to add." STR_DLGFAV_EDIT "Edit" STR_DLGFAV_EDIT_PROMPT "Please enter a string to edit." - STR_DLGFAV_MENU_EDIT "Edit(&E)" + STR_DLGFAV_MENU_EDIT "&Edit" STR_DLGFAV_MENU_ADD "new add(&I)" - STR_DLGFAV_MENU_EXCLUDE "add for except List(&L)" - STR_DLGFAV_MENU_DEL_ALL "All delete(&A)" - STR_DLGFAV_MENU_DEL_NOTFAV "delete except Favorites(&F)" - STR_DLGFAV_MENU_DEL_INVALID "delete missing path(&N)" - STR_DLGFAV_MENU_DEL_SEL "Delete selecting item(&D)" + STR_DLGFAV_MENU_EXCLUDE "add for except &List" + STR_DLGFAV_MENU_DEL_ALL "&All delete" + STR_DLGFAV_MENU_DEL_NOTFAV "delete except &Favorites" + STR_DLGFAV_MENU_DEL_INVALID "delete missi&ng path" + STR_DLGFAV_MENU_DEL_SEL "&Delete selecting item" STR_DLGFAV_LIST_LIMIT_OVER "It was not possible to add full except list." // CDlgFileUpdateQuery.cpp @@ -4019,9 +4019,9 @@ BEGIN // CEditView_Mouse.cpp STR_VIEW_MOUSE_BUG "Possible bug, please report to the development team." - STR_VIEW_MOUSE_MENU_PATH "Drop (&P)ath as text" // LMP: Right-Click Drag&Drop Menu - STR_VIEW_MOUSE_MENU_FILE "Drop (&F)ile as text" - STR_VIEW_MOUSE_MENU_OPEN "(&O)pen File" + STR_VIEW_MOUSE_MENU_PATH "Drop &Path as text" // LMP: Right-Click Drag&Drop Menu + STR_VIEW_MOUSE_MENU_FILE "Drop &File as text" + STR_VIEW_MOUSE_MENU_OPEN "&Open File" STR_VIEW_MOUSE_MENU_CANCEL "Cancel" // CEditWnd.cpp @@ -4616,9 +4616,9 @@ BEGIN // CTabWnd.cpp STR_TABWND_LR_INFO "Left-Click: Tab Name List\nRight-Click: Path List" STR_TABWND_CLOSETAB "Close Tab" - STR_TABWND_SHOWALL "Show (&A)ll" // Menus - STR_TABWND_SHOWTABNAME "S(&w)ap to tab names list" // Windows Menu -> Show Windows - STR_TABWND_SHOWPATHNAME "S(&w)ap to path names list" // Windows Menu -> Show Windows + STR_TABWND_SHOWALL "Show &All" // Menus + STR_TABWND_SHOWTABNAME "S&wap to tab names list" // Windows Menu -> Show Windows + STR_TABWND_SHOWPATHNAME "S&wap to path names list" // Windows Menu -> Show Windows // CTipWnd.cpp @@ -4656,8 +4656,8 @@ User Resrouce\tRemaining %d%%\n\ GDI Resource\tRemaining %d%%\n\n" STR_SHELL_HHCTRL "HHCTRL.OCX could not be found\r\nHTML help requires HHCTRL.OCX.\r\n" STR_SHELL_INFO "Information" - STR_SHELL_MENU_OPEN "Open (&O)..." - STR_SHELL_MENU_IMPEXP "Import/Export Location (&R)eset " + STR_SHELL_MENU_OPEN "&Open ..." + STR_SHELL_MENU_IMPEXP "Import/Export Location &Reset " STR_SHELL_IMPEXPDIR "Reset Import/Export default folder path to\nSettings-Folder path." STR_SHELL_INIFOLDER "Settings Folder(&/) >>" @@ -4781,13 +4781,13 @@ GDI Resource\tRemaining %d%%\n\n" STR_FILETREE_CURDIR "" STR_FILETREE_MAXCOUNT "�ő吔(%d)�𒴂������ߐ؂�̂Ă܂���" STR_FILETREE_MENU_ROOT "&Ini Root" - STR_FILETREE_MENU_MYDOC "M&Y Document" + STR_FILETREE_MENU_MYDOC "M&y Document" STR_FILETREE_MENU_MYMUSIC "My &Music" STR_FILETREE_MENU_MYVIDEO "My &Video" STR_FILETREE_MENU_DESK "&Desktop" STR_FILETREE_MENU_TEMP "&Temp" STR_FILETREE_MENU_SAKURA "&Sakura" - STR_FILETREE_MENU_SAKURADATA "S&Akura data" + STR_FILETREE_MENU_SAKURADATA "S&akura data" STR_FILETREE_REPLACE_PATH_FROM "Please Input Replace 'From' Path" STR_FILETREE_REPLACE_PATH_TO "Please Input Replace 'To' Path"