diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index f89334c..cf3d56c 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -5110,6 +5110,11 @@ void CMy2015RemoteDlg::OnOnlineMessage() void CMy2015RemoteDlg::OnChat() { + // 没选中主机时直接返回:此时确认了也å�‘ä¸�出去(SendSelectedCommand 的目标为空), + // 先弹确认框å�ªæ˜¯ç™½æ‰“扰一次。å�³é”®è�œå�•æ´¾å�‘期间目标在 m_CtxMenuTargets 里,ä¸�å�—æ­¤é™�。 + if (m_CtxMenuTargets.empty() && m_CList_Online.GetFirstSelectedItemPosition() == NULL) + return; + // 二次确认:é�¿å…�误点工具æ �“远程交谈â€�就立刻å�‘被控端å�‘èµ·å�Œå�‘è�Šå¤© if (IDYES != MessageBoxL(_T("确定开始远程交谈å�—?"), _T("æ��示"), MB_ICONQUESTION | MB_YESNO)) return; @@ -13912,9 +13917,13 @@ void CMy2015RemoteDlg::OnMasterTrail() std::string pwd = THIS_CFG.GetStr("settings", "Password"); BOOL noPwd = pwd.empty(); if (!noPwd) { - MessageBoxL("已有授æ�ƒå¯†ç �。请勿将本程åº�用于任何é�žæ³•ã€�è¿�规的用途,å�¦åˆ™å�Žæžœè‡ªè´Ÿï¼�", - "声明", MB_ICONINFORMATION); - return; + // 已有授æ�ƒç �:在原有æ��示å�Žè¿½åŠ è¯¢é—®ï¼Œå…�许改用试用å�£ä»¤è¦†ç›–现有授æ�ƒã€‚ + // 选「是ã€�继续走下é�¢çš„æµ�程(å�«å�ˆè§„声明确认);选「å�¦ã€�ä¿�æŒ�原授æ�ƒä¸�å�˜ã€‚ + if (IDYES != MessageBoxL( + "已有授æ�ƒå¯†ç �。请勿将本程åº�用于任何é�žæ³•ã€�è¿�规的用途,å�¦åˆ™å�Žæžœè‡ªè´Ÿï¼�" + "\r\n\r\n是å�¦æ›´æ–°è¯•用å�£ä»¤ï¼Ÿæ›´æ–°å�ŽåŽŸæœ‰æŽˆæ�ƒç �将被覆盖。", + "声明", MB_ICONQUESTION | MB_YESNO)) + return; } if (IDYES != MessageBoxL("本软件仅é™�于å�ˆæ³•ã€�正当ã€�å�ˆè§„的用途。\r\n您是å�¦å�Œæ„�?", "声明", MB_ICONQUESTION | MB_YESNO)) diff --git a/server/2015Remote/LangManager.h b/server/2015Remote/LangManager.h index 045e100..967a18a 100644 --- a/server/2015Remote/LangManager.h +++ b/server/2015Remote/LangManager.h @@ -324,6 +324,12 @@ public: return m_currentLang; } + // 语言包目录(Init 时确定;为空表示未设置,语言对è¯�框æ�®æ­¤æ˜¾ç¤º"内置/预设") + const CString& GetLangDir() const + { + return m_langDir; + } + // 是å�¦ä¸ºä¸­æ–‡æ¨¡å¼�(无需翻译) bool IsChinese() const { @@ -710,13 +716,13 @@ protected: LPCDLGTEMPLATE CreateDialogTemplate() { const WORD DLG_WIDTH = 260; - const WORD DLG_HEIGHT = 75; + const WORD DLG_HEIGHT = 92; m_templateBuffer.clear(); DLGTEMPLATE dlgTemplate = { 0 }; dlgTemplate.style = DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU; - dlgTemplate.cdit = 4; + dlgTemplate.cdit = 6; dlgTemplate.cx = DLG_WIDTH; dlgTemplate.cy = DLG_HEIGHT; @@ -734,12 +740,19 @@ protected: AddControl(0x0085, 65, 13, 180, 150, 1001, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, _T("")); + // 语言包目录:标签 + å�ªè¯»ç¼–辑框(å�¯é€‰ä¸­å¤�制路径) + // 标签 cx å�– 120:è¦�容纳德语 "Sprachpaketordner:"(约 60 DLU),55 会把译文è£�掉。 + AddControl(0x0082, 15, 33, 120, 10, 1003, + SS_LEFT | WS_CHILD | WS_VISIBLE, _T("语言包目录:")); + AddControl(0x0081, 15, 45, 230, 12, 1004, + ES_LEFT | ES_READONLY | ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE, _T("")); + // OK 按钮 - AddControl(0x0080, 75, 50, 50, 14, IDOK, + AddControl(0x0080, 75, 67, 50, 14, IDOK, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("确定")); // Cancel 按钮 - AddControl(0x0080, 135, 50, 50, 14, IDCANCEL, + AddControl(0x0080, 135, 67, 50, 14, IDCANCEL, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, _T("å�–消")); return (LPCDLGTEMPLATE)m_templateBuffer.data(); @@ -808,6 +821,21 @@ protected: SetDlgItemText(IDOK, _TR("确定")); SetDlgItemText(IDCANCEL, _TR("å�–消")); + // 语言包目录(å�ªè¯»å±•示):目录ä¸�存在时说明å�ªæœ‰å†…嵌语言å�¯ç”¨ã€‚ + // 路径å�¯èƒ½è¾ƒé•¿ï¼ŒæŽ§ä»¶å¸¦ ES_AUTOHSCROLL,å�¯æ¨ªå�‘滚动并选中å¤�制。 + SetDlgItemText(1003, _TR("语言包目录:")); + CString langDir = g_Lang.GetLangDir(); + CString showDir; + if (!langDir.IsEmpty() && GetFileAttributes(langDir) != INVALID_FILE_ATTRIBUTES) { + // é…�置里的默认值是相对路径 "./lang",展示时解æž�æˆ�ç»�对路径,é�¿å…�看ä¸�出实际ä½�ç½® + TCHAR full[MAX_PATH] = { 0 }; + if (GetFullPathName(langDir, MAX_PATH, full, NULL) > 0) + showDir = full; + else + showDir = langDir; + } + SetDlgItemText(1004, showDir.IsEmpty() ? _TR("内置/预设") : showDir); + m_comboLang.SubclassDlgItem(1001, this); // 添加简体中文(显示为英语é�¿å…�ä¹±ç �) diff --git a/server/2015Remote/lang/de_DE.ini b/server/2015Remote/lang/de_DE.ini index 5490b8d..041b3bc 100644 --- a/server/2015Remote/lang/de_DE.ini +++ b/server/2015Remote/lang/de_DE.ini @@ -124,6 +124,8 @@ RTT=RTT ; ============================================ Ñ¡ÔñÓïÑÔ / Select Language=Sprache waehlen ÓïÑÔ:=Sprache: +ÓïÑÔ°üĿ¼:=Sprachpaketordner: +ÄÚÖÃ/Ô¤Éè=Integriert / voreingestellt ; ============================================ ; Common Buttons @@ -410,6 +412,7 @@ Rar ÑÓ³¤ÊÚȨ=Autorisierung verlaengern ·¢ËÍÊÚȨ=Autorisierung senden ³·ÏúÊÚȨ=Autorisierung widerrufen +ÒÑÓÐÊÚȨÃÜÂë¡£ÇëÎ𽫱¾³ÌÐòÓÃÓÚÈκηǷ¨¡¢Î¥¹æµÄÓÃ;£¬·ñÔòºó¹û×Ô¸º£¡\r\n\r\nÊÇ·ñ¸üÐÂÊÔÓÿÚÁ¸üкóÔ­ÓÐÊÚȨÂ뽫±»¸²¸Ç¡£=Es ist bereits ein Autorisierungscode vorhanden. Bitte verwenden Sie dieses Programm nicht fuer illegale oder unzulaessige Zwecke; andernfalls tragen Sie die alleinige Verantwortung fuer die Folgen!\r\n\r\nTestcode aktualisieren? Der vorhandene Autorisierungscode wird ueberschrieben. ×¢Èë¼Çʱ¾=Notepad injizieren »úÆ÷¹ÜÀí=Maschinenverwaltung Ö÷»ú¹ÜÀí=Maschinenverwaltung diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index 0488d10..47514b6 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -127,6 +127,8 @@ RTT=RTT ; ============================================ Ñ¡ÔñÓïÑÔ / Select Language=Select Language ÓïÑÔ:=Language: +ÓïÑÔ°üĿ¼:=Language pack folder: +ÄÚÖÃ/Ô¤Éè=Built-in / preset ; ============================================ ; Common Buttons @@ -414,6 +416,7 @@ Rar ÑÓ³¤ÊÚȨ=Extend Auth ·¢ËÍÊÚȨ=Send Auth ³·ÏúÊÚȨ=Revoke Auth +ÒÑÓÐÊÚȨÃÜÂë¡£ÇëÎ𽫱¾³ÌÐòÓÃÓÚÈκηǷ¨¡¢Î¥¹æµÄÓÃ;£¬·ñÔòºó¹û×Ô¸º£¡\r\n\r\nÊÇ·ñ¸üÐÂÊÔÓÿÚÁ¸üкóÔ­ÓÐÊÚȨÂ뽫±»¸²¸Ç¡£=Existing authorization code found. Please do not use this program for any illegal or improper purposes; otherwise you are solely responsible for the consequences!\r\n\r\nUpdate the trial code? The existing authorization code will be overwritten. ×¢Èë¼Çʱ¾=Inject Notepad »úÆ÷¹ÜÀí=Machine Mgmt Ö÷»ú¹ÜÀí=Host Mgmt diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index 6ffd116..912805d 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -127,6 +127,8 @@ RTT=RTT ; ============================================ Ñ¡ÔñÓïÑÔ / Select Language=ßx“ñÕZÑÔ ÓïÑÔ:=ÕZÑÔ: +ÓïÑÔ°üĿ¼:=ÕZÑÔ°üÄ¿ä›: +ÄÚÖÃ/Ô¤Éè=ƒÈ½¨/îAÔO ; ============================================ ; Common Buttons @@ -414,6 +416,7 @@ Rar ÑÓ³¤ÊÚȨ=ÑÓéLÊÚ™à ·¢ËÍÊÚȨ=°lËÍÊÚ™à ³·ÏúÊÚȨ=³·äNÊÚ™à +ÒÑÓÐÊÚȨÃÜÂë¡£ÇëÎ𽫱¾³ÌÐòÓÃÓÚÈκηǷ¨¡¢Î¥¹æµÄÓÃ;£¬·ñÔòºó¹û×Ô¸º£¡\r\n\r\nÊÇ·ñ¸üÐÂÊÔÓÿÚÁ¸üкóÔ­ÓÐÊÚȨÂ뽫±»¸²¸Ç¡£=ÒÑÓÐÊÚ™àÃÜ´a¡£ÕˆÎðŒ¢±¾³ÌʽÓÃì¶ÈκηǷ¨¡¢ß`ÒŽµÄÓÃ;£¬·ñ„táá¹û×ÔØ“£¡\r\n\r\nÊÇ·ñ¸üÐÂÔ‡ÓÿÚÁ¸üÐÂááÔ­ÓÐÊÚ™à´aŒ¢±»¸²Éw¡£ ×¢Èë¼Çʱ¾=×¢Èëӛʱ¾ »úÆ÷¹ÜÀí=™CÆ÷¹ÜÀí Ö÷»ú¹ÜÀí=Ö÷™C¹ÜÀí