Skip to content

Commit

Permalink
Merge pull request #1242 from 7-rate/feature/GREPUI
Browse files Browse the repository at this point in the history 
GrepとGrep置換ダイアログの微調整
  • Loading branch information
@m-tmatma
m-tmatma authored Apr 26, 2020
2 parents c0ee803 + 33fce93 commit 8339035
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 52 deletions.
56 changes: 28 additions & 28 deletions sakura_core/sakura_rc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ BEGIN
COMBOBOX IDC_COMBO_FOLDER, 64, 36, 262, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&...", IDC_BUTTON_FOLDER, 328, 36, 9, 13

LTEXT "除外ファイル", IDC_STATIC, 5, 52, 52, 8, NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE, 64, 52, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "除外ファイル", IDC_STATIC, 5, 51, 52, 8, NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE, 64, 51, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "除外フォルダ", IDC_STATIC, 5, 66, 52, 8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER, 64, 66, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

Expand All @@ -205,19 +205,19 @@ BEGIN
CONTROL "フォルダの初期値をカレントフォルダにする(&D)", IDC_CHK_DEFAULTFOLDER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 209, 164, 10
CONTROL "正規表現(&E)", IDC_CHK_REGULAREXP, "Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP, 5, 225, 55, 10
LTEXT "JRE Status", IDC_STATIC_JRE32VER, 18, 241, 159, 8
GROUPBOX "結果出力", IDC_STATIC, 150, 79, 107, 46, WS_GROUP
CONTROL "該当行(&L)", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 89, 83, 9
CONTROL "該当部分(&P)", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 100, 83, 10
CONTROL "否該当行(&1)", IDC_RADIO_NOHIT, "Button", BS_AUTORADIOBUTTON, 155, 112, 83, 10
GROUPBOX "結果出力形式", IDC_STATIC, 150, 129, 107, 47, WS_GROUP
CONTROL "ノーマル(&M)", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 139, 83, 10
CONTROL "ファイル毎(&I)",IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 151, 83, 10
CONTROL "結果のみ(&R)",IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 163, 83, 10
PUSHBUTTON "上フォルダ(&B)", IDC_BUTTON_FOLDER_UP, 288, 80, 49, 14
PUSHBUTTON "現フォルダ(&U)", IDC_BUTTON_CURRENTFOLDER, 288, 102, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "検索(&F)", IDOK, 288, 125, 49, 14, WS_GROUP
PUSHBUTTON "キャンセル(&X)", IDCANCEL, 288, 149, 49, 14
PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 288, 174, 49,14
GROUPBOX "結果出力", IDC_STATIC, 150, 84, 107, 46, WS_GROUP
CONTROL "該当行(&L)", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 94, 83, 9
CONTROL "該当部分(&P)", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 105, 83, 10
CONTROL "否該当行(&1)", IDC_RADIO_NOHIT, "Button", BS_AUTORADIOBUTTON, 155, 117, 83, 10
GROUPBOX "結果出力形式", IDC_STATIC, 150, 134, 107, 47, WS_GROUP
CONTROL "ノーマル(&M)", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 144, 83, 10
CONTROL "ファイル毎(&I)",IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 156, 83, 10
CONTROL "結果のみ(&R)",IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 168, 83, 10
PUSHBUTTON "上フォルダ(&B)", IDC_BUTTON_FOLDER_UP, 288, 83, 49, 14
PUSHBUTTON "現フォルダ(&U)", IDC_BUTTON_CURRENTFOLDER, 288, 105, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "検索(&F)", IDOK, 288, 128, 49, 14, WS_GROUP
PUSHBUTTON "キャンセル(&X)", IDCANCEL, 288, 152, 49, 14
PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 288, 177, 49,14
END

IDD_GREP_REPLACE DIALOGEX 0, 0, 348, 304
Expand Down Expand Up @@ -259,19 +259,19 @@ BEGIN
CONTROL "クリップボードから貼り付ける(&J)", IDC_CHK_PASTE, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 5, 273, 116, 10
CONTROL "バックアップ作成(&K)", IDC_CHK_BACKUP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 289, 164, 10

GROUPBOX "結果出力", IDC_STATIC, 150, 94, 107, 33, WS_GROUP
CONTROL "該当行(&L)", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 104, 83, 9
CONTROL "該当部分(&P)", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 115, 83, 10

GROUPBOX "結果出力形式", IDC_STATIC, 150, 144, 107, 47, WS_GROUP
CONTROL "ノーマル(&M)", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 154, 83, 10
CONTROL "ファイル毎(&I)",IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 166, 83, 10
CONTROL "結果のみ(&R)",IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 178, 83, 10
PUSHBUTTON "上フォルダ(&B)", IDC_BUTTON_FOLDER_UP, 288, 95, 49, 14
PUSHBUTTON "現フォルダ(&U)", IDC_BUTTON_CURRENTFOLDER, 288, 117, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "置換(&R)", IDOK, 288, 140, 49, 14, WS_GROUP
PUSHBUTTON "キャンセル(&X)", IDCANCEL, 288, 164, 49, 14
PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 288, 189, 49,14
GROUPBOX "結果出力", IDC_STATIC, 150, 99, 107, 33, WS_GROUP
CONTROL "該当行(&L)", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 109, 83, 9
CONTROL "該当部分(&P)", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 120, 83, 10

GROUPBOX "結果出力形式", IDC_STATIC, 150, 149, 107, 47, WS_GROUP
CONTROL "ノーマル(&M)", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 159, 83, 10
CONTROL "ファイル毎(&I)",IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 171, 83, 10
CONTROL "結果のみ(&R)",IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 183, 83, 10
PUSHBUTTON "上フォルダ(&B)", IDC_BUTTON_FOLDER_UP, 288, 98, 49, 14
PUSHBUTTON "現フォルダ(&U)", IDC_BUTTON_CURRENTFOLDER, 288, 120, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "置換(&R)", IDOK, 288, 143, 49, 14, WS_GROUP
PUSHBUTTON "キャンセル(&X)", IDCANCEL, 288, 167, 49, 14
PUSHBUTTON "ヘルプ(&H)", IDC_BUTTON_HELP, 288, 192, 49,14
END

IDD_GREPRUNNING DIALOGEX 0, 0, 293, 79
Expand Down
48 changes: 24 additions & 24 deletions sakura_lang_en_US/sakura_lang_rc.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ BEGIN
COMBOBOX IDC_COMBO_FOLDER, 64, 36, 262, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&...", IDC_BUTTON_FOLDER, 328, 36, 9, 13

LTEXT "Exclude File", IDC_STATIC, 5, 52, 52, 8, NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE, 64, 52, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "Exclude File", IDC_STATIC, 5, 51, 52, 8, NOT WS_GROUP
COMBOBOX IDC_COMBO_EXCLUDE_FILE, 64, 51, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "Exclude Folder", IDC_STATIC, 5, 66, 52, 8
COMBOBOX IDC_COMBO_EXCLUDE_FOLDER, 64, 66, 273, 120, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

Expand All @@ -211,19 +211,19 @@ BEGIN
CONTROL "&Default for Folder is 1st Folder", IDC_CHK_DEFAULTFOLDER, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 209, 164, 10
CONTROL "R&egex", IDC_CHK_REGULAREXP, "Button", BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP, 5, 225, 55, 10
LTEXT "JRE Status",IDC_STATIC_JRE32VER, 18, 241, 159, 8
GROUPBOX "Result Ouput",IDC_STATIC,150,79,107,46,WS_GROUP
CONTROL "Complete &Line", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 89, 83, 9
CONTROL "Matching &Part", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 100, 83, 10
CONTROL "NoHit Line(&1)", IDC_RADIO_NOHIT, "Button", BS_AUTORADIOBUTTON, 155, 112, 83, 10
GROUPBOX "Output Format", IDC_STATIC, 150, 129, 107, 47, WS_GROUP
CONTROL "Nor&mal", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,139,83,10
CONTROL "Per-F&ile", IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 151, 83, 10
CONTROL "&Result Only", IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 163, 83, 10
PUSHBUTTON "Up(&B)", IDC_BUTTON_FOLDER_UP, 288, 80, 49, 14
PUSHBUTTON "C&ur Folder", IDC_BUTTON_CURRENTFOLDER, 288, 102, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "&Find", IDOK, 288, 125, 49, 14, WS_GROUP
PUSHBUTTON "Cancel(&X)", IDCANCEL, 288, 149, 49, 14
PUSHBUTTON "&Help", IDC_BUTTON_HELP, 288, 174, 49, 14
GROUPBOX "Result Ouput",IDC_STATIC,150,84,107,46,WS_GROUP
CONTROL "Complete &Line", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 94, 83, 9
CONTROL "Matching &Part", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 105, 83, 10
CONTROL "NoHit Line(&1)", IDC_RADIO_NOHIT, "Button", BS_AUTORADIOBUTTON, 155, 117, 83, 10
GROUPBOX "Output Format", IDC_STATIC, 150, 134, 107, 47, WS_GROUP
CONTROL "Nor&mal", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,144,83,10
CONTROL "Per-F&ile", IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 156, 83, 10
CONTROL "&Result Only", IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 168, 83, 10
PUSHBUTTON "Up(&B)", IDC_BUTTON_FOLDER_UP, 288, 83, 49, 14
PUSHBUTTON "C&ur Folder", IDC_BUTTON_CURRENTFOLDER, 288, 105, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "&Find", IDOK, 288, 128, 49, 14, WS_GROUP
PUSHBUTTON "Cancel(&X)", IDCANCEL, 288, 152, 49, 14
PUSHBUTTON "&Help", IDC_BUTTON_HELP, 288, 177, 49, 14
END

IDD_GREP_REPLACE DIALOGEX 0, 0, 348, 304
Expand Down Expand Up @@ -265,17 +265,17 @@ BEGIN
CONTROL "Paste from Clipboard(&Z)", IDC_CHK_PASTE, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 5, 273, 116, 10
CONTROL "Bac&kup", IDC_CHK_BACKUP, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 289, 164, 10

GROUPBOX "Result Output", IDC_STATIC, 150, 94, 107, 33, WS_GROUP
CONTROL "Complete &Line", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 104, 83, 9
CONTROL "Matching &Part", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 115, 83, 10

GROUPBOX "Output Format", IDC_STATIC, 150, 144, 107, 47, WS_GROUP
CONTROL "Nor&mal", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,154,83,10
CONTROL "Per-F&ile", IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 166, 83, 10
CONTROL "&Result Only", IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 178, 83, 10
GROUPBOX "Result Output", IDC_STATIC, 150, 99, 107, 33, WS_GROUP
CONTROL "Complete &Line", IDC_RADIO_OUTPUTLINE, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 155, 109, 83, 9
CONTROL "Matching &Part", IDC_RADIO_OUTPUTMARKED, "Button", BS_AUTORADIOBUTTON, 155, 120, 83, 10

GROUPBOX "Output Format", IDC_STATIC, 150, 149, 107, 47, WS_GROUP
CONTROL "Nor&mal", IDC_RADIO_OUTPUTSTYLE1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,155,159,83,10
CONTROL "Per-F&ile", IDC_RADIO_OUTPUTSTYLE2, "Button", BS_AUTORADIOBUTTON, 155, 171, 83, 10
CONTROL "&Result Only", IDC_RADIO_OUTPUTSTYLE3, "Button", BS_AUTORADIOBUTTON, 155, 183, 83, 10
PUSHBUTTON "Up(&B)", IDC_BUTTON_FOLDER_UP, 288, 95, 49, 14
PUSHBUTTON "C&ur Folder", IDC_BUTTON_CURRENTFOLDER, 288, 117, 49, 14, BS_MULTILINE
DEFPUSHBUTTON "&Replace", IDOK, 288, 137, 49, 14, WS_GROUP
DEFPUSHBUTTON "&Replace", IDOK, 288, 140, 49, 14, WS_GROUP
PUSHBUTTON "Cancel(&X)", IDCANCEL, 288, 164, 49, 14
PUSHBUTTON "&Help", IDC_BUTTON_HELP, 288, 189, 49, 14
END
Expand Down

0 comments on commit 8339035

Please sign in to comment.