Skip to content

Commit

Permalink
Merge pull request #1672 from suconbu/feature/shrink_grepdlg
Browse files Browse the repository at this point in the history 
Grep/Grep置換ダイアログの余白調整/文言統一
  • Loading branch information
@suconbu
suconbu authored May 21, 2021
2 parents 6be2aec + f62e948 commit 0843eb9
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 131 deletions.
143 changes: 74 additions & 69 deletions sakura_core/sakura_rc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,53 +128,53 @@ BEGIN
COMBOBOX IDC_COMBO_nSortType,34,3,94,65,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
END

IDD_GREP DIALOGEX 0, 0, 390, 192
IDD_GREP DIALOGEX 0, 0, 390, 188
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "Grep"
FONT 9, "Yu Gothic UI", 0, 0, 0x1
BEGIN
RTEXT "条件(&N):",IDC_STATIC,4,4,52,8
COMBOBOX IDC_COMBO_TEXT,60,4,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "単語単位(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,18,80,8
CONTROL "英大小文字区別(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,28,80,8
CONTROL "単語単位で探す(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,18,80,8
CONTROL "英大文字と小文字を区別する(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,28,120,8
CONTROL "正規表現(&E)",IDC_CHK_REGULAREXP,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,38,80,8
RTEXT "(ここに正規表現ライブラリのバージョン情報が表示されます)",IDC_STATIC_JRE32VER,144,38,188,8
RTEXT "検索場所(&L):",IDC_STATIC,4,52,52,8
COMBOBOX IDC_COMBO_FOLDER,60,52,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&...",IDC_BUTTON_FOLDER,316,52,16,10
CONTROL "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,66,100,8
CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,76,100,8
CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,86,100,8
PUSHBUTTON "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,66,50,14
PUSHBUTTON "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,66,50,14,BS_MULTILINE
RTEXT "対象ファイル(&I):",IDC_STATIC,4,100,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_FILE,60,100,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外ファイル(&J):",IDC_STATIC,4,114,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,114,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外フォルダ(&K):",IDC_STATIC,4,128,53,8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,128,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
GROUPBOX "結果出力",IDC_STATIC,60,144,68,44,WS_GROUP
CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,156,56,8
CONTROL "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,166,56,8
CONTROL "否該当行(&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,68,176,56,8
GROUPBOX "結果出力形式",IDC_STATIC,132,144,68,44,WS_GROUP
CONTROL "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,156,52,8
CONTROL "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,166,52,8
CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,176,52,8
GROUPBOX "その他",IDC_STATIC,204,144,180,44,WS_GROUP
CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,156,92,8
CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,166,92,8
CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,92,8
LTEXT "文字コードセット(&A):",IDC_STATIC,312,152,62,8
COMBOBOX IDC_COMBO_CHARSET,312,162,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,176,30,8
RTEXT "検索場所(&L):",IDC_STATIC,4,50,52,8
COMBOBOX IDC_COMBO_FOLDER,60,50,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&...",IDC_BUTTON_FOLDER,316,50,16,10
CONTROL "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,64,120,8
CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,74,120,8
CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,84,120,8
PUSHBUTTON "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,64,50,14
PUSHBUTTON "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,64,50,14,BS_MULTILINE
RTEXT "対象ファイル(&I):",IDC_STATIC,4,96,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_FILE,60,96,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外ファイル(&J):",IDC_STATIC,4,110,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外フォルダ(&K):",IDC_STATIC,4,124,53,8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
GROUPBOX "結果出力",IDC_STATIC,60,140,68,44,WS_GROUP
CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,152,56,8
CONTROL "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,162,56,8
CONTROL "否該当行(&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,68,172,56,8
GROUPBOX "結果出力形式",IDC_STATIC,132,140,68,44,WS_GROUP
CONTROL "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,152,56,8
CONTROL "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,162,56,8
CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,172,56,8
GROUPBOX "その他",IDC_STATIC,204,140,180,44,WS_GROUP
CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,152,96,8
CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,162,96,8
CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,172,96,8
LTEXT "文字コードセット(&A):",IDC_STATIC,312,148,66,8
COMBOBOX IDC_COMBO_CHARSET,312,158,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,172,30,8
DEFPUSHBUTTON "検索(&F)",IDOK,336,4,50,14,WS_GROUP
PUSHBUTTON "キャンセル(&X)",IDCANCEL,336,20,50,14
PUSHBUTTON "ヘルプ(&H)",IDC_BUTTON_HELP,336,36,50,14
END

IDD_GREP_REPLACE DIALOGEX 0, 0, 390, 204
IDD_GREP_REPLACE DIALOGEX 0, 0, 390, 202
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "Grep置換"
Expand All @@ -184,40 +184,40 @@ BEGIN
COMBOBOX IDC_COMBO_TEXT,60,4,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "置換後(&Z):",IDC_STATIC,4,18,52,10
COMBOBOX IDC_COMBO_TEXT2,60,18,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "単語単位(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,32,80,8
CONTROL "英大小文字区別(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,42,80,8
CONTROL "単語単位で探す(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,32,80,8
CONTROL "英大文字と小文字を区別する(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,42,120,8
CONTROL "正規表現(&E)",IDC_CHK_REGULAREXP,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,52,80,8
CONTROL "クリップボードの内容で置換(&V)",IDC_CHK_PASTE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,196,32,120,8
CONTROL "バックアップ作成(&B)",IDC_CHK_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,42,120,8
RTEXT "(ここに正規表現ライブラリのバージョン情報が表示されます)",IDC_STATIC_JRE32VER,144,52,188,8
RTEXT "検索場所(&L):",IDC_STATIC,4,64,52,8
COMBOBOX IDC_COMBO_FOLDER,60,64,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&...",IDC_BUTTON_FOLDER,316,64,16,10
CONTROL "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,78,100,8
CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,100,8
CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,100,8
CONTROL "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,78,120,8
CONTROL "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,120,8
CONTROL "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,120,8
PUSHBUTTON "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,78,50,14
PUSHBUTTON "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,78,50,14,BS_MULTILINE
RTEXT "対象ファイル(&I):",IDC_STATIC,4,114,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_FILE,60,114,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外ファイル(&J):",IDC_STATIC,4,128,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,128,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外フォルダ(&K):",IDC_STATIC,4,142,52,8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,142,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
GROUPBOX "結果出力",IDC_STATIC,60,156,68,44,WS_GROUP
CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,168,56,8
CONTROL "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,178,56,8
GROUPBOX "結果出力形式",IDC_STATIC,132,156,68,44,WS_GROUP
CONTROL "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,168,52,8
CONTROL "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,178,52,8
CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,188,52,8
GROUPBOX "その他",IDC_STATIC,204,156,180,44,WS_GROUP
CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,168,92,8
CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,178,92,8
CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,188,92,8
LTEXT "文字コードセット(&A):",IDC_STATIC,312,164,62,8
COMBOBOX IDC_COMBO_CHARSET,312,174,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,188,30,8
RTEXT "対象ファイル(&I):",IDC_STATIC,4,110,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外ファイル(&J):",IDC_STATIC,4,124,52,8,NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
RTEXT "除外フォルダ(&K):",IDC_STATIC,4,138,52,8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER,60,138,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
GROUPBOX "結果出力",IDC_STATIC,60,154,68,44,WS_GROUP
CONTROL "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,166,56,8
CONTROL "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,176,56,8
GROUPBOX "結果出力形式",IDC_STATIC,132,154,68,44,WS_GROUP
CONTROL "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,166,56,8
CONTROL "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,176,56,8
CONTROL "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,186,56,8
GROUPBOX "その他",IDC_STATIC,204,154,180,44,WS_GROUP
CONTROL "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,166,96,8
CONTROL "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,96,8
CONTROL "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,186,96,8
LTEXT "文字コードセット(&A):",IDC_STATIC,312,162,62,8
COMBOBOX IDC_COMBO_CHARSET,312,172,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,186,30,8
DEFPUSHBUTTON "置換(&R)",IDOK,336,4,50,14,WS_GROUP
PUSHBUTTON "キャンセル(&X)",IDCANCEL,336,20,50,14
PUSHBUTTON "ヘルプ(&H)",IDC_BUTTON_HELP,336,36,50,14
Expand Down Expand Up @@ -1736,15 +1736,15 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 303
TOPMARGIN, 7
BOTTOMMARGIN, 136
BOTTOMMARGIN, 132
END

IDD_GREP_REPLACE, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 303
TOPMARGIN, 7
BOTTOMMARGIN, 158
BOTTOMMARGIN, 156
END

IDD_GREPRUNNING, DIALOG
Expand Down Expand Up @@ -2183,6 +2183,11 @@ BEGIN
0
END

IDD_GREP_REPLACE AFX_DIALOG_LAYOUT
BEGIN
0
END


/////////////////////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -3409,8 +3414,6 @@ BEGIN
STR_ERR_DLGEDITVW6 "■"
STR_MENU_KEYWORDINFO "キーワードの説明をクリップボードにコピー"
STR_MENU_OPENKEYWORDDIC "キーワード辞書を開く"
STR_STATUS_FONTZOOM_0 "%4.0f %%"
STR_STATUS_FONTZOOM_1 "%4.1f %%"
STR_STATUS_ROW_COL "%5d 行 %4d 桁"
STR_INS_MODE_INS "挿入"
STR_INS_MODE_OVR "上書"
Expand All @@ -3423,6 +3426,15 @@ BEGIN
STR_GREP_COMPLETE_WORD " (単語単位で探す)\r\n"
END

STRINGTABLE
BEGIN
STR_FILEDIALOG_MRU "最近のファイル(&F):"
STR_FILEDIALOG_OPENFOLDER "最近のフォルダ(&D):"
STR_IMPEXP_REGEX4 "キーワードが長過ぎるため切り捨てました。"
STR_STATUS_FONTZOOM_0 "%4.0f %%"
STR_STATUS_FONTZOOM_1 "%4.1f %%"
END

STRINGTABLE
BEGIN
STR_GREP_CASE_SENSITIVE " (英大文字小文字を区別する)\r\n"
Expand Down Expand Up @@ -3905,13 +3917,6 @@ BEGIN
STR_ERR_CSHAREDATA18 "${w?$h$:アウトプット$:$f$}${U?(更新)$} - sakura $V ${R?(読みとり専用)$:（上書き禁止）$}${M? 【キーマクロの記録中】$}"
END

STRINGTABLE
BEGIN
STR_FILEDIALOG_MRU "最近のファイル(&F):"
STR_FILEDIALOG_OPENFOLDER "最近のフォルダ(&D):"
STR_IMPEXP_REGEX4 "キーワードが長過ぎるため切り捨てました。"
END

STRINGTABLE
BEGIN
STR_ERR_CSHAREDATA19 "同時に複数の編集用ウィンドウを閉じようとしています。これらを閉じますか?"
Expand Down
Loading

0 comments on commit 0843eb9

Please sign in to comment.