diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 70d14ea7..68a1adf3 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -970,17 +970,17 @@ You can define several column markers by using white space to separate the diffe - - - - - - - - - - - + + + + + + + + + + + diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.cpp b/PowerEditor/src/ScitillaComponent/columnEditor.cpp index a19aab67..86423565 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.cpp +++ b/PowerEditor/src/ScitillaComponent/columnEditor.cpp @@ -300,12 +300,10 @@ void ColumnEditorDlg::switchTo(bool toText) { HWND hText = ::GetDlgItem(_hSelf, IDC_COL_TEXT_EDIT); ::EnableWindow(hText, toText); - ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_TEXT_GRP_STATIC), toText); ::SendDlgItemMessage(_hSelf, IDC_COL_TEXT_RADIO, BM_SETCHECK, toText, 0); HWND hNum = ::GetDlgItem(_hSelf, IDC_COL_INITNUM_EDIT); ::SendDlgItemMessage(_hSelf, IDC_COL_NUM_RADIO, BM_SETCHECK, !toText, 0); - ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_NUM_GRP_STATIC), !toText); ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_INITNUM_STATIC), !toText); ::EnableWindow(hNum, !toText); ::EnableWindow(::GetDlgItem(_hSelf, IDC_COL_INCRNUM_STATIC), !toText); diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.rc b/PowerEditor/src/ScitillaComponent/columnEditor.rc index 64822852..14ef9f9c 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.rc +++ b/PowerEditor/src/ScitillaComponent/columnEditor.rc @@ -36,27 +36,27 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE CAPTION "Column / Multi-Selection Editor" FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0 BEGIN - GROUPBOX "Text to Insert",IDC_COL_TEXT_GRP_STATIC,12,10,124,54 - GROUPBOX "Number to Insert",IDC_COL_NUM_GRP_STATIC,12,75,204,139 - CONTROL "",IDC_COL_TEXT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,7,10,8,9 - CONTROL "",IDC_COL_NUM_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP, 7,75,8,9 + GROUPBOX "",IDC_COL_TEXT_GRP_STATIC,12,14,124,50 + GROUPBOX "",IDC_COL_NUM_GRP_STATIC,12,79,204,135 + CONTROL "&Text to Insert",IDC_COL_TEXT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,7,5,124,9 + CONTROL "&Number to Insert",IDC_COL_NUM_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP, 7,70,204,9 EDITTEXT IDC_COL_TEXT_EDIT,25,32,97,14,ES_AUTOHSCROLL - RTEXT "Initial number :",IDC_COL_INITNUM_STATIC,15,91,76,8 + RTEXT "&Initial number :",IDC_COL_INITNUM_STATIC,15,91,76,8 EDITTEXT IDC_COL_INITNUM_EDIT,95,89,38,12,ES_NUMBER - RTEXT "Increase by :",IDC_COL_INCRNUM_STATIC,16,112,75,8 + RTEXT "Increase b&y :",IDC_COL_INCRNUM_STATIC,16,112,75,8 EDITTEXT IDC_COL_INCREASENUM_EDIT,95,110,38,12,ES_NUMBER - RTEXT "Repeat :",IDC_COL_REPEATNUM_STATIC,16,133,75,8 + RTEXT "&Repeat :",IDC_COL_REPEATNUM_STATIC,16,133,75,8 EDITTEXT IDC_COL_REPEATNUM_EDIT,95,131,38,12,ES_NUMBER - CONTROL "Leading zeros", IDC_COL_LEADZERO_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,140,133,70,10 + CONTROL "Leading &zeros", IDC_COL_LEADZERO_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,140,133,70,10 - CONTROL "Dec",IDC_COL_DEC_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,30,169,70,10 - CONTROL "Hex",IDC_COL_HEX_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,124,169,70,10 - CONTROL "Oct",IDC_COL_OCT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,30,188,70,10 - CONTROL "Bin",IDC_COL_BIN_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,124,188,70,10 - GROUPBOX "Format",IDC_COL_FORMAT_GRP_STATIC,20,153,188,54,BS_CENTER + CONTROL "&Dec",IDC_COL_DEC_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,30,169,70,10 + CONTROL "&Hex",IDC_COL_HEX_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,124,169,70,10 + CONTROL "&Oct",IDC_COL_OCT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,30,188,70,10 + CONTROL "&Bin",IDC_COL_BIN_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,124,188,70,10 + GROUPBOX "&Format",IDC_COL_FORMAT_GRP_STATIC,20,153,188,54,BS_CENTER DEFPUSHBUTTON "OK",IDOK,145,13,70,14,BS_NOTIFY PUSHBUTTON "Cancel",IDCANCEL,145,36,70,14,BS_NOTIFY END diff --git a/PowerEditor/src/ScitillaComponent/columnEditor_rc.h b/PowerEditor/src/ScitillaComponent/columnEditor_rc.h index 82f676b7..903db32d 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor_rc.h +++ b/PowerEditor/src/ScitillaComponent/columnEditor_rc.h @@ -32,20 +32,20 @@ #define IDD_COLUMNEDIT 2020 #define IDC_COL_INITNUM_EDIT (IDD_COLUMNEDIT + 1) #define IDC_COL_INCREASENUM_EDIT (IDD_COLUMNEDIT + 2) - #define IDC_COL_TEXT_GRP_STATIC (IDD_COLUMNEDIT + 3) + #define IDC_COL_TEXT_RADIO (IDD_COLUMNEDIT + 3) #define IDC_COL_DEC_RADIO (IDD_COLUMNEDIT + 4) #define IDC_COL_OCT_RADIO (IDD_COLUMNEDIT + 5) #define IDC_COL_HEX_RADIO (IDD_COLUMNEDIT + 6) #define IDC_COL_BIN_RADIO (IDD_COLUMNEDIT + 7) - #define IDC_COL_TEXT_RADIO (IDD_COLUMNEDIT + 8) - #define IDC_COL_NUM_RADIO (IDD_COLUMNEDIT + 9) + #define IDC_COL_TEXT_GRP_STATIC (IDD_COLUMNEDIT + 8) + #define IDC_COL_NUM_GRP_STATIC (IDD_COLUMNEDIT + 9) #define IDC_COL_INITNUM_STATIC (IDD_COLUMNEDIT + 10) #define IDC_COL_INCRNUM_STATIC (IDD_COLUMNEDIT + 11) #define IDC_COL_FORMAT_GRP_STATIC (IDD_COLUMNEDIT + 12) - #define IDC_COL_NUM_GRP_STATIC (IDD_COLUMNEDIT + 13) + #define IDC_COL_NUM_RADIO (IDD_COLUMNEDIT + 13) #define IDC_COL_TEXT_EDIT (IDD_COLUMNEDIT + 14) #define IDC_COL_LEADZERO_CHECK (IDD_COLUMNEDIT + 15) #define IDC_COL_REPEATNUM_STATIC (IDD_COLUMNEDIT + 16) #define IDC_COL_REPEATNUM_EDIT (IDD_COLUMNEDIT + 17) - + #endif// COLUMNEDITOR_RC_H