From 8d0f419093fed83fc74dbcde93b83881e2e005d2 Mon Sep 17 00:00:00 2001
From: yuanyuanxiang <962914132@qq.com>
Date: Sun, 4 Oct 2026 14:39:38 +0200
Subject: [PATCH] Improve: multi-line keyword input in notification settings

Replace the single-line, semicolon-separated keyword field with a taller
multi-line edit box (with a vertical scrollbar) where each keyword goes on
its own line. The stored format stays semicolon-separated, so existing
notify.ini files remain valid; load/save convert between newlines and
semicolons, trimming each keyword and skipping empty lines.

Also decode the stored matchPattern as UTF-8 when loading the dialog, so
non-ASCII keywords round-trip correctly (matching the CP_UTF8 encoding
used on save).

Co-Authored-By: deepseek-v4-pro
---
 server/2015Remote/2015Remote.rc         | Bin 174646 -> 174756 bytes
 server/2015Remote/NotifySettingsDlg.cpp |  41 ++++++++++++++++++++++--
 server/2015Remote/lang/en_US.ini        |   2 +-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc
index 5ef24ff909857279e7ea8e8e531283941aba2afe..3d41393cd2c23d4e907159aec6c0bc9c3f245bb9 100644
GIT binary patch
delta 154
zcmV;L0A>HS)C#243V^f$#w3?6SOLVhiX{Pd2m>(yGPeOP0Z#-0G?RggOOxn}E|Y*p
zNDwFh&udJG08T1Sb5Smp&5M_|G67ZxIRH2SEC4c>AwdBZlkhPjmr64MUIj7$F#t4|
zv0DKdm&P*zU<oq-Gyp6BGXOA`Ar=7@lm0I@mRtcwm%uauB$skr0XUZ+n*k1oDm4MO
IDm4NObpa(V3;+NC

delta 194
zcmV;z06qVt)e5%M3V^f$#v}nWlTnSsw~8eJb_kbRCIJwW?qwpkG%f)i1eaI@0wR}y
zJOM5iC;%E+Do%4zE|txTD0K!>_frN^l$MtyGXYisH<w)u0vnU?F(Q^%0SK4CGXYiw
zF#tFKGnXG+0U4L(76CAm;5rPKa5MoV2`~UP04xAA05F#!76BEL{x3F{Zd?Hf12O<L
wlL5#(m*7SL91Au8FaRt7G5|6FHJ2?|0Vk8tKn|CVn*k1om^A^nm^A_nbqd`$wg3PC

diff --git a/server/2015Remote/NotifySettingsDlg.cpp b/server/2015Remote/NotifySettingsDlg.cpp
index 2b88945..651827e 100644
--- a/server/2015Remote/NotifySettingsDlg.cpp
+++ b/server/2015Remote/NotifySettingsDlg.cpp
@@ -56,7 +56,7 @@ BOOL NotifySettingsDlg::OnInitDialog()
     SetDlgItemText(IDC_STATIC_TRIGGER, _TR(_T("触发条件:")));
     SetDlgItemText(IDC_STATIC_MATCH_COLUMN, _TR(_T("匹配列:")));
     SetDlgItemText(IDC_STATIC_KEYWORDS, _TR(_T("关键词:")));
-    SetDlgItemText(IDC_STATIC_KEYWORDS_HINT, _TR(_T("(多个关键词用分号分隔，匹配任一项即触发通知)")));
+    SetDlgItemText(IDC_STATIC_KEYWORDS_HINT, _TR(_T("(每行一个关键词，匹配任一项即触发通知)")));
     SetDlgItemText(IDC_STATIC_NOTIFY_TIP, _TR(_T("提示: 同一主机 60 分钟内仅通知一次")));
     SetDlgItemText(IDOK, _TR("确定"));
     SetDlgItemText(IDCANCEL, _TR("取消"));
@@ -154,7 +154,24 @@ void NotifySettingsDlg::LoadSettings()
         m_comboNotifyColumn.SetCurSel(rule.columnIndex);
     }
 
-    m_editNotifyPattern.SetWindowText(CString(rule.matchPattern.c_str()));
+    // Display stored semicolon-separated keywords as one keyword per line.
+    {
+        CString pattern;
+        const CString stored(CA2T(rule.matchPattern.c_str(), CP_UTF8));
+        int start = 0;
+        for (;;) {
+            const int pos = stored.Find(_T(';'), start);
+            CString kw = (pos < 0) ? stored.Mid(start) : stored.Mid(start, pos - start);
+            kw.Trim();
+            if (!kw.IsEmpty()) {
+                if (!pattern.IsEmpty()) pattern += _T("\r\n");
+                pattern += kw;
+            }
+            if (pos < 0) break;
+            start = pos + 1;
+        }
+        m_editNotifyPattern.SetWindowText(pattern);
+    }
 }
 
 void NotifySettingsDlg::SaveSettings()
@@ -189,8 +206,26 @@ void NotifySettingsDlg::SaveSettings()
     sel = m_comboNotifyColumn.GetCurSel();
     rule.columnIndex = (sel >= 0) ? (int)m_comboNotifyColumn.GetItemData(sel) : ONLINELIST_COMPUTER_NAME;
 
+    // Normalize one-keyword-per-line input back to semicolon-separated storage.
     m_editNotifyPattern.GetWindowText(str);
-    rule.matchPattern = CT2A(str, CP_UTF8);
+    str.Replace(_T("\r\n"), _T("\n"));
+    str.Replace(_T('\r'), _T('\n'));
+    {
+        CString joined;
+        int start = 0;
+        for (;;) {
+            const int pos = str.Find(_T('\n'), start);
+            CString kw = (pos < 0) ? str.Mid(start) : str.Mid(start, pos - start);
+            kw.Trim();
+            if (!kw.IsEmpty()) {
+                if (!joined.IsEmpty()) joined += _T(';');
+                joined += kw;
+            }
+            if (pos < 0) break;
+            start = pos + 1;
+        }
+        rule.matchPattern = CT2A(joined, CP_UTF8);
+    }
 
     // Update manager config and save
     GetNotifyManager().SetConfig(m_config);
diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini
index cb78628..4733d9e 100644
--- a/server/2015Remote/lang/en_US.ini
+++ b/server/2015Remote/lang/en_US.ini
@@ -1493,7 +1493,7 @@ SMTP 
 ��������:=Trigger:
 ƥ����:=Match Column:
 �ؼ���:=Keywords:
-(����ؼ����÷ֺŷָ���ƥ����һ�����֪ͨ)=(Multiple keywords separated by semicolon)
+(ÿ��һ���ؼ��ʣ�ƥ����һ�����֪ͨ)=(One keyword per line)
 ��ʾ: ͬһ���� 60 �����ڽ�֪ͨһ��=Tip: Same host notified only once per 60 minutes
 ��������=Host Online
 IP��ַ=IP Address