X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=toolmenu.c;h=786a75484f7cd5d4ec239468dbffac2a86d0f8d2;hb=12e22e37ba002e45ecc54fbad867072a3cc2fac8;hp=8dde5bb3ce610e854be9d3b3ef50c936ef313160;hpb=1f4ca95ce22d4d2a3e639aaa306f71aee7467267;p=ffftp%2Fffftp.git diff --git a/toolmenu.c b/toolmenu.c index 8dde5bb..786a754 100644 --- a/toolmenu.c +++ b/toolmenu.c @@ -140,11 +140,13 @@ static TBBUTTON TbarDataMain[] = { { 20, MENU_L_KNJ_EUC, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 21, MENU_L_KNJ_JIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 28, MENU_L_KNJ_UTF8N, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, + { 29, MENU_L_KNJ_UTF8BOM, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 0, 0, TBSTATE_ENABLED, BTNS_SEP, 0, 0 }, { 27, MENU_KNJ_SJIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 20, MENU_KNJ_EUC, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 21, MENU_KNJ_JIS, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 28, MENU_KNJ_UTF8N, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, + { 29, MENU_KNJ_UTF8BOM, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 22, MENU_KNJ_NONE, TBSTATE_ENABLED, TBSTYLE_CHECKGROUP, 0, 0 }, { 0, 0, TBSTATE_ENABLED, BTNS_SEP, 0, 0 }, { 23, MENU_KANACNV, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0 }, @@ -195,8 +197,8 @@ static const int HideMenus[] = { MENU_HELP, MENU_HELP_TROUBLE, MENU_ABOUT, MENU_REGINIT, MENU_TEXT, MENU_BINARY, MENU_AUTO, - MENU_KNJ_SJIS, MENU_KNJ_EUC, MENU_KNJ_JIS, MENU_KNJ_UTF8N, MENU_KNJ_NONE, - MENU_L_KNJ_SJIS, MENU_L_KNJ_EUC, MENU_L_KNJ_JIS, MENU_L_KNJ_UTF8N, + MENU_KNJ_SJIS, MENU_KNJ_EUC, MENU_KNJ_JIS, MENU_KNJ_UTF8N, MENU_KNJ_UTF8BOM, MENU_KNJ_NONE, + MENU_L_KNJ_SJIS, MENU_L_KNJ_EUC, MENU_L_KNJ_JIS, MENU_L_KNJ_UTF8N, MENU_L_KNJ_UTF8BOM, MENU_KANACNV, MENU_LOCAL_UPDIR, MENU_LOCAL_CHDIR, MENU_REMOTE_UPDIR, MENU_REMOTE_CHDIR, @@ -233,7 +235,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst) hWndTbarMain = CreateToolbarEx( hWnd, - WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP, + WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_TOP | TBSTYLE_FLAT, 1, 27, hInst, @@ -258,7 +260,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst) hWndTbarLocal = CreateToolbarEx( hWnd, - WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE, + WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT, 2, 2, hInst, @@ -321,7 +323,7 @@ int MakeToolBarWindow(HWND hWnd, HINSTANCE hInst) hWndTbarRemote = CreateToolbarEx( hWnd, - WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE, + WS_CHILD | WS_VISIBLE | TBSTYLE_TOOLTIPS | CCS_NORESIZE | TBSTYLE_FLAT, 3, 2, hInst, @@ -395,6 +397,8 @@ static LRESULT CALLBACK HistEditBoxWndProc(HWND hWnd, UINT message, WPARAM wPara } else { + // 同時接続対応 + CancelFlg = NO; SendMessage(hWndDirRemoteEdit, WM_GETTEXT, FMAX_PATH+1, (LPARAM)Tmp); if(CheckClosedAndReconnect() == FFFTP_SUCCESS) { @@ -1026,6 +1030,10 @@ void SetHostKanjiCode(int Type) TmpHostKanjiCode = KANJI_UTF8N; break; + case MENU_KNJ_UTF8BOM : + TmpHostKanjiCode = KANJI_UTF8BOM; + break; + default : TmpHostKanjiCode = KANJI_NOCNV; break; @@ -1066,6 +1074,10 @@ void DispHostKanjiCode(void) SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_UTF8N, MAKELONG(TRUE, 0)); break; + case KANJI_UTF8BOM : + SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(TRUE, 0)); + break; + default : SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_KNJ_NONE, MAKELONG(TRUE, 0)); break; @@ -1108,6 +1120,7 @@ void HideHostKanjiButton(void) SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_EUC, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_JIS, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8N, MAKELONG(FALSE, 0)); + SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_NONE, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(FALSE, 0)); break; @@ -1117,6 +1130,7 @@ void HideHostKanjiButton(void) SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_EUC, MAKELONG(TRUE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_JIS, MAKELONG(TRUE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8N, MAKELONG(TRUE, 0)); + SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_UTF8BOM, MAKELONG(TRUE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KNJ_NONE, MAKELONG(TRUE, 0)); // if(TmpHostKanjiCode != KANJI_NOCNV) // SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(TRUE, 0)); @@ -1177,6 +1191,10 @@ void SetLocalKanjiCode(int Type) case MENU_L_KNJ_UTF8N : TmpLocalKanjiCode = KANJI_UTF8N; break; + + case MENU_L_KNJ_UTF8BOM : + TmpLocalKanjiCode = KANJI_UTF8BOM; + break; } DispLocalKanjiCode(); HideLocalKanjiButton(); @@ -1203,6 +1221,10 @@ void DispLocalKanjiCode(void) case KANJI_UTF8N : SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(TRUE, 0)); break; + + case KANJI_UTF8BOM : + SendMessage(hWndTbarMain, TB_CHECKBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(TRUE, 0)); + break; } return; } @@ -1222,6 +1244,7 @@ void HideLocalKanjiButton(void) SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_EUC, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_JIS, MAKELONG(FALSE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(FALSE, 0)); + SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(FALSE, 0)); break; default : @@ -1229,6 +1252,7 @@ void HideLocalKanjiButton(void) SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_EUC, MAKELONG(TRUE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_JIS, MAKELONG(TRUE, 0)); SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8N, MAKELONG(TRUE, 0)); + SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_L_KNJ_UTF8BOM, MAKELONG(TRUE, 0)); // 現在カナ変換はShift_JIS、JIS、EUC間でのみ機能する SendMessage(hWndTbarMain, TB_ENABLEBUTTON, MENU_KANACNV, MAKELONG(FALSE, 0)); switch(TmpHostKanjiCode)