diff -ruN ffftp-1.97a-src/common.h ffftp-1.97a-src(list-a)/common.h --- ffftp-1.97a-src/common.h Mon Feb 8 16:58:36 2010 +++ ffftp-1.97a-src(list-a)/common.h Thu Feb 11 23:51:30 2010 @@ -123,6 +123,7 @@ #define CHMOD_CMD_LEN 40 /* 属性変更コマンド */ #define MIRROR_LEN 400 /* ミラーリングの設定用 */ #define NLST_NAME_LEN 40 /* NLSTに付けるファイル名／オプション */ +#define LIST_NAME_LEN 40 /* LISTに付けるオプション */ #define DEFATTRLIST_LEN 800 /* 属性リストの長さ */ #define INITCMD_LEN 256 /* 初期化コマンド */ #define OWNER_NAME_LEN 40 /* オーナ名 */ @@ -138,6 +139,7 @@ #define CHMOD_CMD_NOR "SITE CHMOD" /* 属性変更コマンド */ #define PORT_NOR 21 /* ポート番号 */ #define LS_FNAME "-alL" /* NLSTに付けるもの */ +#define IS_FNAME "-a" /* LISTに付けるもの */ /*===== 同じ名前のファイルがあった時の処理 =====*/ @@ -872,6 +874,7 @@ char BookMark[BOOKMARK_SIZE]; /* ブックマーク */ char ChmodCmd[CHMOD_CMD_LEN+1]; /* 属性変更コマンド */ char LsName[NLST_NAME_LEN+1]; /* NLSTに付けるファイル名/オプション*/ + char IsName[LIST_NAME_LEN+1]; /* LISTに付けるオプション*/ char InitCmd[INITCMD_LEN+1]; /* ホストの初期化コマンド */ int Port; /* ポート番号 */ int Anonymous; /* Anonymousフラグ */ @@ -894,6 +897,7 @@ int DialupAlways; /* 常にこのエントリへ接続するかどうか (YES/NO) */ int DialupNotify; /* 再接続の際に確認する (YES/NO) */ char DialEntry[RAS_NAME_LEN+1]; /* ダイアルアップエントリ */ + int UseQuickCMD; /* クイック接続時に使うコマンド ( 2(NLST -alL) / 1(LIST) / 0(LIST -a) ) */ } HOSTDATA; @@ -919,6 +923,7 @@ char RemoteInitDir[INIT_DIR_LEN+1]; /* ディレクトリ */ char ChmodCmd[CHMOD_CMD_LEN+1]; /* 属性変更コマンド */ char LsName[NLST_NAME_LEN+1]; /* NLSTに付けるファイル名/オプション*/ + char IsName[LIST_NAME_LEN+1]; /* LISTに付けるオプション*/ char InitCmd[INITCMD_LEN+1]; /* ホストの初期化コマンド */ int Port; /* ポート番号 */ int KanjiCode; /* ホストの漢字コード (KANJI_xxx) */ @@ -1310,6 +1315,7 @@ int AskHostTimeZone(void); int AskPasvMode(void); char *AskHostLsName(void); +char *AskHostIsName(void); int AskHostType(void); int AskHostFireWall(void); int AskNoFullPathMode(void); diff -ruN ffftp-1.97a-src/connect.c ffftp-1.97a-src(list-a)/connect.c --- ffftp-1.97a-src/connect.c Tue Feb 2 15:48:06 2010 +++ ffftp-1.97a-src(list-a)/connect.c Thu Feb 11 23:51:30 2010 @@ -229,6 +229,10 @@ CurHost.FireWall = (int)Tmp[FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1]; CurHost.Pasv = (int)Tmp[FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1 + 1]; + CurHost.UseQuickCMD = (int)Tmp[FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1 + 1 + 1]; + if(CurHost.UseQuickCMD != 2) CurHost.ListCmdOnly = 1; // UseQuickCMD = 2(NLST -alL) / 1(LIST) / 0(LIST -a) + if(CurHost.UseQuickCMD == 1) strcpy(CurHost.IsName, ""); + SetHostKanaCnvImm(CurHost.KanaCnv); SetHostKanjiCodeImm(CurHost.KanjiCode); SetSyncMoveMode(CurHost.SyncMove); @@ -302,6 +306,11 @@ SendDlgItemMessage(hDlg, QHOST_PASS, EM_LIMITTEXT, PASSWORD_LEN, 0); SendDlgItemMessage(hDlg, QHOST_FWALL, BM_SETCHECK, FwallDefault, 0); SendDlgItemMessage(hDlg, QHOST_PASV, BM_SETCHECK, PasvDefault, 0); + SendDlgItemMessage(hDlg, QHOST_CMD, CB_ADDSTRING, 0, (LPARAM)"LIST -a"); + SendDlgItemMessage(hDlg, QHOST_CMD, CB_ADDSTRING, 0, (LPARAM)"LIST"); + SendDlgItemMessage(hDlg, QHOST_CMD, CB_ADDSTRING, 0, (LPARAM)"NLST -alL(-alLR)"); + SendDlgItemMessage(hDlg, QHOST_CMD, CB_SETDROPPEDWIDTH, 100, 0 ); + SendDlgItemMessage(hDlg, QHOST_CMD, CB_SETCURSEL, 0, 0); for(i = 0; i < HISTORY_MAX; i++) { if(GetHistoryByNum(i, &Tmp) == SUCCESS) @@ -323,6 +332,7 @@ SendDlgItemMessage(hDlg, QHOST_PASS, WM_GETTEXT, PASSWORD_LEN+1, (LPARAM)Buf + FMAX_PATH+1 + USER_NAME_LEN+1); *(Buf + FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1) = (char)SendDlgItemMessage(hDlg, QHOST_FWALL, BM_GETCHECK, 0, 0); *(Buf + FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1+1) = (char)SendDlgItemMessage(hDlg, QHOST_PASV, BM_GETCHECK, 0, 0); + *(Buf + FMAX_PATH+1 + USER_NAME_LEN+1 + PASSWORD_LEN+1+1+1) = (char)SendDlgItemMessage(hDlg, QHOST_CMD, CB_GETCURSEL, 0, 0); EndDialog(hDlg, YES); break; @@ -763,6 +773,24 @@ } +/*----- 接続しているホストのLISTオプションを返す ------------------------------ +* +* Parameter +* なし +* +* Return Value +* char *ファイル名／オプション +*----------------------------------------------------------------------------*/ + +char *AskHostIsName(void) +{ + if(AskCurrentHost() != HOSTNUM_NOENTRY) + CopyHostFromListInConnect(AskCurrentHost(), &CurHost); + + return(CurHost.IsName); +} + + /*----- 接続しているホストのホストタイプを返す -------------------------------- * * Parameter @@ -796,6 +824,21 @@ } +/*----- クイック接続時にホストで使うコマンド(NLST -alL/LIST/LIST -a)番号を返す ---- +* +* Parameter +* なし +* +* Return Value +* int 2(NLST -alL) / 1(LIST) / 0(LIST -a) +*----------------------------------------------------------------------------*/ + +int AskHostUseQuickCMD(void) +{ + return(CurHost.UseQuickCMD); +} + + /*----- 接続しているホストでフルパスでファイルアクセスしないかどうかを返す ---- * * Parameter diff -ruN ffftp-1.97a-src/history.c ffftp-1.97a-src(list-a)/history.c --- ffftp-1.97a-src/history.c Tue Feb 2 15:48:06 2010 +++ ffftp-1.97a-src(list-a)/history.c Thu Feb 11 23:51:30 2010 @@ -203,6 +203,7 @@ strcpy(New->RemoteInitDir, Host->RemoteInitDir); strcpy(New->ChmodCmd, Host->ChmodCmd); strcpy(New->LsName, Host->LsName); + strcpy(New->IsName, Host->IsName); strcpy(New->InitCmd, Host->InitCmd); New->Port = Host->Port; New->KanjiCode = Host->KanjiCode; @@ -252,6 +253,7 @@ strcpy(Host->RemoteInitDir, Hist->RemoteInitDir); strcpy(Host->ChmodCmd, Hist->ChmodCmd); strcpy(Host->LsName, Hist->LsName); + strcpy(Host->IsName, Hist->IsName); strcpy(Host->InitCmd, Hist->InitCmd); Host->Port = Hist->Port; Host->KanjiCode = Hist->KanjiCode; diff -ruN ffftp-1.97a-src/hostman.c ffftp-1.97a-src(list-a)/hostman.c --- ffftp-1.97a-src/hostman.c Tue Feb 2 15:48:06 2010 +++ ffftp-1.97a-src(list-a)/hostman.c Thu Feb 11 23:51:30 2010 @@ -1266,6 +1266,7 @@ memcpy(Set->BookMark, "\0\0", 2); strcpy(Set->ChmodCmd, CHMOD_CMD_NOR); strcpy(Set->LsName, LS_FNAME); + strcpy(Set->IsName, IS_FNAME); strcpy(Set->InitCmd, ""); Set->Port = PORT_NOR; Set->Anonymous = NO; @@ -1977,7 +1978,9 @@ SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, EM_LIMITTEXT, CHMOD_CMD_LEN, 0); SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, WM_SETTEXT, 0, (LPARAM)TmpHost.ChmodCmd); SendDlgItemMessage(hDlg, HSET_LS_FNAME, EM_LIMITTEXT, NLST_NAME_LEN, 0); + SendDlgItemMessage(hDlg, HSET_IS_FNAME, EM_LIMITTEXT, LIST_NAME_LEN, 0); SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_SETTEXT, 0, (LPARAM)TmpHost.LsName); + SendDlgItemMessage(hDlg, HSET_IS_FNAME, WM_SETTEXT, 0, (LPARAM)TmpHost.IsName); SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_SETCHECK, TmpHost.ListCmdOnly, 0); if(TmpHost.ListCmdOnly == YES) EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), FALSE); @@ -2007,6 +2010,7 @@ case PSN_APPLY : SendDlgItemMessage(hDlg, HSET_CHMOD_CMD, WM_GETTEXT, CHMOD_CMD_LEN+1, (LPARAM)TmpHost.ChmodCmd); SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_GETTEXT, NLST_NAME_LEN+1, (LPARAM)TmpHost.LsName); + SendDlgItemMessage(hDlg, HSET_IS_FNAME, WM_GETTEXT, LIST_NAME_LEN+1, (LPARAM)TmpHost.IsName); TmpHost.ListCmdOnly = SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0); TmpHost.UseNLST_R = SendDlgItemMessage(hDlg, HSET_NLST_R, BM_GETCHECK, 0, 0); TmpHost.NoFullPath = SendDlgItemMessage(hDlg, HSET_FULLPATH, BM_GETCHECK, 0, 0); @@ -2034,6 +2038,10 @@ SendDlgItemMessage(hDlg, HSET_LS_FNAME, WM_SETTEXT, 0, (LPARAM)LS_FNAME); break; + case HSET_IS_FNAME_NOR : + SendDlgItemMessage(hDlg, HSET_IS_FNAME, WM_SETTEXT, 0, (LPARAM)IS_FNAME); + break; + case HSET_LISTCMD : if(SendDlgItemMessage(hDlg, HSET_LISTCMD, BM_GETCHECK, 0, 0) == 0) EnableWindow(GetDlgItem(hDlg, HSET_NLST_R), TRUE); diff -ruN ffftp-1.97a-src/registory.c ffftp-1.97a-src(list-a)/registory.c --- ffftp-1.97a-src/registory.c Mon Feb 8 16:49:58 2010 +++ ffftp-1.97a-src(list-a)/registory.c Thu Feb 11 23:51:30 2010 @@ -439,6 +439,7 @@ SaveStr(hKey5, "RemoteDir", Hist.RemoteInitDir, DefaultHist.RemoteInitDir); SaveStr(hKey5, "Chmod", Hist.ChmodCmd, DefaultHist.ChmodCmd); SaveStr(hKey5, "Nlst", Hist.LsName, DefaultHist.LsName); + SaveStr(hKey5, "ListOption", Hist.IsName, DefaultHist.IsName); SaveStr(hKey5, "Init", Hist.InitCmd, DefaultHist.InitCmd); EncodePassword(Hist.PassWord, Str); SaveStr(hKey5, "Password", Str, DefaultHist.PassWord); @@ -498,6 +499,7 @@ SaveStr(hKey5, "RemoteDir", Host.RemoteInitDir, DefaultHost.RemoteInitDir); SaveStr(hKey5, "Chmod", Host.ChmodCmd, DefaultHost.ChmodCmd); SaveStr(hKey5, "Nlst", Host.LsName, DefaultHost.LsName); + SaveStr(hKey5, "ListOption", Host.IsName, DefaultHost.IsName); SaveStr(hKey5, "Init", Host.InitCmd, DefaultHost.InitCmd); if(Host.Anonymous == NO) @@ -756,6 +758,7 @@ ReadStringFromReg(hKey5, "RemoteDir", Hist.RemoteInitDir, INIT_DIR_LEN+1); ReadStringFromReg(hKey5, "Chmod", Hist.ChmodCmd, CHMOD_CMD_LEN+1); ReadStringFromReg(hKey5, "Nlst", Hist.LsName, NLST_NAME_LEN+1); + ReadStringFromReg(hKey5, "ListOption", Hist.IsName, LIST_NAME_LEN+1); ReadStringFromReg(hKey5, "Init", Hist.InitCmd, INITCMD_LEN+1); ReadIntValueFromReg(hKey5, "Port", &Hist.Port); ReadIntValueFromReg(hKey5, "Kanji", &Hist.KanjiCode); @@ -812,6 +815,7 @@ ReadStringFromReg(hKey5, "RemoteDir", Host.RemoteInitDir, INIT_DIR_LEN+1); ReadStringFromReg(hKey5, "Chmod", Host.ChmodCmd, CHMOD_CMD_LEN+1); ReadStringFromReg(hKey5, "Nlst", Host.LsName, NLST_NAME_LEN+1); + ReadStringFromReg(hKey5, "ListOption", Host.IsName, LIST_NAME_LEN+1); ReadStringFromReg(hKey5, "Init", Host.InitCmd, INITCMD_LEN+1); ReadIntValueFromReg(hKey5, "Port", &Host.Port); ReadIntValueFromReg(hKey5, "Anonymous", &Host.Anonymous); diff -ruN ffftp-1.97a-src/remote.c ffftp-1.97a-src(list-a)/remote.c --- ffftp-1.97a-src/remote.c Tue Feb 2 15:48:06 2010 +++ ffftp-1.97a-src(list-a)/remote.c Thu Feb 11 23:51:30 2010 @@ -588,6 +588,11 @@ else { strcpy(MainTransPkt.Cmd, "LIST"); + if(strlen(AskHostIsName()) > 0) + { + strcat(MainTransPkt.Cmd, " "); + strcat(MainTransPkt.Cmd, AskHostIsName()); + } if(strlen(AddOpt) > 0) { strcat(MainTransPkt.Cmd, " -"); diff -ruN ffftp-1.97a-src/Resource/FFFTP.rc ffftp-1.97a-src(list-a)/Resource/FFFTP.rc --- ffftp-1.97a-src/Resource/FFFTP.rc Mon Feb 8 16:58:38 2010 +++ ffftp-1.97a-src(list-a)/Resource/FFFTP.rc Thu Feb 11 23:51:30 2010 @@ -464,21 +464,23 @@ CONTROL "デバッグ",MISC_DEBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,122,40,10 END -hostname_dlg DIALOG 0, 0, 187, 93 +hostname_dlg DIALOG 0, 0, 206, 93 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "接続先" +CAPTION "クイック接続" FONT 9, "ＭＳ Ｐゴシック" BEGIN LTEXT "ホスト名（アドレス）またはURL(&H)",-1,7,6,130,8 - COMBOBOX QHOST_HOST,7,16,173,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + COMBOBOX QHOST_HOST,7,16,194,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "ユーザ名(&U)",-1,7,34,57,8 - EDITTEXT QHOST_USER,7,44,80,12,ES_AUTOHSCROLL - LTEXT "パスワード/パスフレーズ(&P)",-1,99,34,87,8 - EDITTEXT QHOST_PASS,99,44,80,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "FireWallを使う(&F)",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,75,10 - CONTROL "PASVモードを使う(&V)",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,61,83,10 - DEFPUSHBUTTON "OK",IDOK,36,75,50,14 - PUSHBUTTON "キャンセル",IDCANCEL,101,75,50,14 + EDITTEXT QHOST_USER,7,44,93,12,ES_AUTOHSCROLL + LTEXT "パスワード/パスフレーズ(&P)",-1,109,34,87,8 + EDITTEXT QHOST_PASS,108,44,92,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "FireWallを使う(&F)",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,61,60,10 + CONTROL "PASVモードを使う(&V)",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,64,61,72,10 + LTEXT "を使う(&C)",-1,179,62,130,8 + COMBOBOX QHOST_CMD,138,59,40,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,39,75,50,14 + PUSHBUTTON "キャンセル",IDCANCEL,115,75,50,14 END passwd_dlg DIALOG 0, 0, 187, 43 @@ -989,9 +991,12 @@ PUSHBUTTON "標準",HSET_CHMOD_NOR,70,61,25,13 LTEXT "ホストの種類(&H)",-1,7,80,69,8 COMBOBOX HSET_HOSTTYPE,7,90,71,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "NLSTファイル名/オプション",-1,7,109,89,8 + LTEXT "NLST ファイル名/オプション",-1,7,109,89,8 EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL PUSHBUTTON "標準",HSET_LS_FNAME_NOR,70,119,25,13 + LTEXT "LIST オプション",-1,107,109,89,8 + EDITTEXT HSET_IS_FNAME,106,119,62,12,ES_AUTOHSCROLL + PUSHBUTTON "標準",HSET_IS_FNAME_NOR,170,119,25,13 END cwderr_dlg DIALOG 0, 0, 154, 69 diff -ruN ffftp-1.97a-src/Resource/resource.h ffftp-1.97a-src(list-a)/Resource/resource.h --- ffftp-1.97a-src/Resource/resource.h Sun Feb 7 08:53:22 2010 +++ ffftp-1.97a-src(list-a)/Resource/resource.h Thu Feb 11 23:51:30 2010 @@ -416,6 +416,9 @@ #define IDC_EDIT1 1191 #define MOVE_NOTIFY_TEXT 1194 #define COMMON_TEXT 1194 +#define HSET_IS_FNAME 2000 +#define HSET_IS_FNAME_NOR 2001 +#define QHOST_CMD 2002 #define MENU_END 40001 #define MENU_EXIT 40001 #define MENU_CONNECT 40003 diff -ruN ffftp-1.97a-src/Resource_eng/FFFTP-eng.rc ffftp-1.97a-src(list-a)/Resource_eng/FFFTP-eng.rc --- ffftp-1.97a-src/Resource_eng/FFFTP-eng.rc Mon Feb 8 16:58:38 2010 +++ ffftp-1.97a-src(list-a)/Resource_eng/FFFTP-eng.rc Thu Feb 11 23:51:30 2010 @@ -208,21 +208,23 @@ PUSHBUTTON "Help",9,165,102,50,14 END -hostname_dlg DIALOG 0, 0, 187, 93 +hostname_dlg DIALOG 0, 0, 206, 93 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Quick Connect" FONT 9, "MS Sans Serif" BEGIN LTEXT "&Host Name/Address",-1,7,6,130,8 - COMBOBOX QHOST_HOST,7,16,173,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + COMBOBOX QHOST_HOST,7,16,194,86,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "&Username",-1,7,34,57,8 - EDITTEXT QHOST_USER,7,44,80,12,ES_AUTOHSCROLL - LTEXT "&Password/Phrase",-1,99,34,87,8 - EDITTEXT QHOST_PASS,99,44,80,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,75,10 - CONTROL "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,61,83,10 - DEFPUSHBUTTON "OK",IDOK,36,75,50,14 - PUSHBUTTON "Cancel",IDCANCEL,101,75,50,14 + EDITTEXT QHOST_USER,7,44,93,12,ES_AUTOHSCROLL + LTEXT "&Password/Phrase",-1,109,34,87,8 + EDITTEXT QHOST_PASS,108,44,92,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Use &Firewall",QHOST_FWALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,52,10 + CONTROL "Use PAS&V mode",QHOST_PASV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,61,65,10 + LTEXT "Use(&C)",-1,137,61,21,8 + COMBOBOX QHOST_CMD,161,59,40,45,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,39,75,50,14 + PUSHBUTTON "Cancel",IDCANCEL,115,75,50,14 END hset_adv2_dlg DIALOG 0, 0, 207, 139 @@ -242,6 +244,9 @@ LTEXT "NLST &Filename/Option",-1,7,109,89,8 EDITTEXT HSET_LS_FNAME,7,119,62,12,ES_AUTOHSCROLL PUSHBUTTON "Delault",HSET_LS_FNAME_NOR,70,119,28,13 + LTEXT "LIST &Option",-1,112,109,89,8 + EDITTEXT HSET_IS_FNAME,111,119,62,12,ES_AUTOHSCROLL + PUSHBUTTON "Default",HSET_IS_FNAME_NOR,174,119,28,13 END hset_adv_dlg DIALOG 0, 0, 207, 139 diff -ruN ffftp-1.97a-src/Resource_eng/resource.h ffftp-1.97a-src(list-a)/Resource_eng/resource.h --- ffftp-1.97a-src/Resource_eng/resource.h Sun Feb 7 08:53:22 2010 +++ ffftp-1.97a-src(list-a)/Resource_eng/resource.h Thu Feb 11 23:51:30 2010 @@ -415,6 +415,9 @@ #define ABOUT_URL 1187 #define IDC_EDIT1 1191 #define COMMON_TEXT 1194 +#define HSET_IS_FNAME 2000 +#define HSET_IS_FNAME_NOR 2001 +#define QHOST_CMD 2002 #define MENU_END 40001 #define MENU_EXIT 40001 #define MENU_CONNECT 40003