Skip to content

Commit 135e355

Browse files
SpaceTimeeSpaceTimee
committed
1.1.10更新
1 parent 1644cb5 commit 135e355

8 files changed

Lines changed: 178 additions & 125 deletions

File tree

‎Forms/AboutForm.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Vight_Note
77
{
88
public partial class AboutForm : Form
99
{
10-
public static class Define
10+
private static class Define
1111
{
1212
public const string MAINPAGE_URL = "https://www.spacetimee.xyz/";
1313
public const string OPENSOURCE_URL = "https://github.com/SpaceTimee/Vight-Note";
@@ -17,11 +17,11 @@ public static class Define
1717
{
1818
"你用过.vtxt文件吗?", "试试把文件拖进来吧", "锁定输入也会锁定热键", "求求别用Ctrl+Alt+E了", "亲，给个Star呗~",
1919
"咕咕咕", "6月31日打开会有惊喜", "你在看我吗(⁄ ⁄•⁄ω⁄•⁄ ⁄)", "Vight是姓，Note是名" ,"Error: 404 Not Found",
20-
"窗口太小了? 那就把它拉长","❤", "I am simply a note", "关于: 关于:","•ᴗ•",
20+
"窗口太小了? 那就把它拉长​​​​‎‍‌​​​​‏‌​​​​​‏​‎​​​​‏​‏​​​​‏‎‌​​​​‌‌‍​​​​‎​‎​​​​‏‍‌​​​​‏‎‌​​​​‏​‌","❤", "I am simply a note", "关于: 关于:","•ᴗ•",
2121
"便签也需要休息呢","(｡･ω･｡)ﾉ♡" ,"Ciallo～(∠・ω< )⌒★","住在电脑里也很舒服呢~","便签和人类是两个物种",
2222
"我不吃饭,我吃电", "胡萝卜是什么味道的呢?","棒棒糖是什么味道的呢?","外面的世界是什么样的?","(๑• . •๑)",
2323
"更新失败就多试几次吧","主...主人?","轻模式是个好东西","?","你见过多少条关于呢?",
24-
"试试用Esc键关闭弹窗吧","1000001000","VmlnaHQ Tm90ZQ","​​​​‎‍‌​​​​‏‌​​​​​‏​‎​​​​‏​‏​​​​‏‎‌​​​​‌‌‍​​​​‎​‎​​​​‏‍‌​​​​‏‎‌​​​​‏​‌"
24+
"试试用Esc键关闭弹窗吧","1000001000","VmlnaHQ Tm90ZQ"
2525
};
2626
}
2727

‎Forms/MainForm.cs‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Vight_Note
1212
{
1313
public partial class MainForm : System.Windows.Forms.Form
1414
{
15-
public static class Define
15+
private static class Define
1616
{
1717
public const string NAME = @"Vight Note";
1818
public static readonly string VERSION = Application.ProductVersion;
@@ -32,11 +32,11 @@ public static class Define
3232
public const string BAIDU_TRANSLATE_API = @"https://fanyi.baidu.com/#zh/en/";
3333

3434
public const string EMAIL_REGEX = @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
35-
36-
public static bool CHANGE_MARK = false;
37-
public static string FILE_PATH = @"";
3835
}
3936

37+
private static bool CHANGE_MARK = false;
38+
private static string FILE_PATH = @"";
39+
4040
public MainForm(string[] args)
4141
{
4242
InitializeComponent();
@@ -47,7 +47,7 @@ public MainForm(string[] args)
4747
//拖拽至图标打开文件
4848
if (args.Length >= 1)
4949
{
50-
Define.FILE_PATH = args[0];
50+
FILE_PATH = args[0];
5151
ImportFile();
5252
}
5353
}
@@ -132,7 +132,7 @@ private void Close_Click(object sender, EventArgs e)
132132
private void Save_Click(object sender, EventArgs e)
133133
{
134134
//显示文件保存窗口，向用户获取保存路径
135-
if (sender == Export || Define.FILE_PATH == "")
135+
if (sender == Export || FILE_PATH == "")
136136
{
137137
SaveFileDialog saveDialog = new SaveFileDialog();
138138

@@ -152,19 +152,19 @@ private void Save_Click(object sender, EventArgs e)
152152
if (saveDialog.ShowDialog() != DialogResult.OK)
153153
return;
154154
else
155-
Define.FILE_PATH = saveDialog.FileName.ToString(); //文件路径
155+
FILE_PATH = saveDialog.FileName.ToString(); //文件路径
156156
}
157157

158158
//写文件
159-
FileStream saver = new FileStream(Define.FILE_PATH, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
159+
FileStream saver = new FileStream(FILE_PATH, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
160160
StreamWriter writer = new StreamWriter(saver);
161161
writer.Write(TextBox.Text);
162162
writer.Flush();
163163
writer.Close();
164164
saver.Close();
165165

166-
Text = Path.GetFileName(Define.FILE_PATH);
167-
Define.CHANGE_MARK = false;
166+
Text = Path.GetFileName(FILE_PATH);
167+
CHANGE_MARK = false;
168168
}
169169
private void Export_Click(object sender, EventArgs e)
170170
{
@@ -192,7 +192,7 @@ private void Import_Click(object sender, EventArgs e)
192192

193193
if (openDialog.ShowDialog() == DialogResult.OK)
194194
{
195-
Define.FILE_PATH = openDialog.FileName.ToString(); //文件路径
195+
FILE_PATH = openDialog.FileName.ToString(); //文件路径
196196
ImportFile();
197197
}
198198
}
@@ -378,14 +378,21 @@ private void Run_Click(object sender, EventArgs e)
378378
else
379379
Process.Start(TextBox.SelectedText); //文件路径
380380
}
381-
catch
381+
catch //百度搜索
382382
{
383-
Process.Start(Define.BAIDU_SEARCH_API + Uri.EscapeDataString(TextBox.SelectedText)); //百度搜索
383+
if (TextBox.SelectionLength > 3628)
384+
Process.Start(Define.BAIDU_SEARCH_API + Uri.EscapeDataString(TextBox.SelectedText.Substring(0, 3628))); //最长32659(编码后汉字长度x9)
385+
else
386+
Process.Start(Define.BAIDU_SEARCH_API + Uri.EscapeDataString(TextBox.SelectedText)); //正常选择
384387
}
385388
}
386389
private void Translate_Click(object sender, EventArgs e)
387390
{
388-
Process.Start(Define.BAIDU_TRANSLATE_API + TextBox.SelectedText); //百度翻译
391+
//百度翻译
392+
if (TextBox.SelectionLength > 32650)
393+
Process.Start(Define.BAIDU_TRANSLATE_API + TextBox.SelectedText.Substring(0, 32655)); //最长32655
394+
else
395+
Process.Start(Define.BAIDU_TRANSLATE_API + TextBox.SelectedText); //正常选择
389396
}
390397

391398
//拖放
@@ -401,7 +408,7 @@ private void TextBox_DragDrop(object sender, DragEventArgs e)
401408
if (e.Data.GetDataPresent(DataFormats.FileDrop))
402409
{
403410
string[] path = (string[])e.Data.GetData(DataFormats.FileDrop);
404-
Define.FILE_PATH = path[0];
411+
FILE_PATH = path[0];
405412
ImportFile();
406413
}
407414
}
@@ -504,10 +511,10 @@ private void LiteShortcut(bool turnOn)
504511
//文件未保存标记
505512
private void TextBox_TextChanged(object sender, EventArgs e)
506513
{
507-
if (!Define.CHANGE_MARK)
514+
if (!CHANGE_MARK)
508515
{
509516
Text += "*";
510-
Define.CHANGE_MARK = true;
517+
CHANGE_MARK = true;
511518
}
512519
}
513520
//导入
@@ -517,7 +524,7 @@ private void ImportFile()
517524
if (LockTextBox.Checked)
518525
return;
519526

520-
if (!System.IO.File.Exists(Define.FILE_PATH) || !LiteMode.Checked && ((Path.GetExtension(Define.FILE_PATH) != ".txt" && Path.GetExtension(Define.FILE_PATH) != ".vtxt")))
527+
if (!System.IO.File.Exists(FILE_PATH) || !LiteMode.Checked && ((Path.GetExtension(FILE_PATH) != ".txt" && Path.GetExtension(FILE_PATH) != ".vtxt")))
521528
{
522529
//非正常后缀提示
523530
MessageBox.Show("请不要往我里面塞奇怪的东西...");
@@ -533,15 +540,15 @@ private void ImportFile()
533540
}
534541

535542
//读文件
536-
FileStream importer = new FileStream(Define.FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
543+
FileStream importer = new FileStream(FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
537544
StreamReader reader = new StreamReader(importer);
538545
TextBox.Text = reader.ReadToEnd();
539546

540-
Text = Path.GetFileName(Define.FILE_PATH);
541-
Define.CHANGE_MARK = false;
547+
Text = Path.GetFileName(FILE_PATH);
548+
CHANGE_MARK = false;
542549
}
543550
//字符串格式匹配
544-
public static bool CheckStrFormat(string regexRule, string strValue)
551+
private bool CheckStrFormat(string regexRule, string strValue)
545552
{
546553
Regex regex = new Regex(regexRule);
547554
return regex.IsMatch(strValue);

‎Forms/SearchForm.cs‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ namespace Vight_Note.Forms
55
{
66
public partial class SearchForm : Form
77
{
8-
public static class Define
8+
private static class Define
99
{
1010
public static MainForm MAIN_FORM;
11-
12-
public static string SEARCH_TEXT = "";
13-
public static int START_INDEX = -1, SELECT_LENGTH = 0;
14-
public static int SEARCH_NUM = 0;
1511
}
1612

13+
private string SEARCH_TEXT = "";
14+
private int START_INDEX = -1, SELECT_LENGTH = 0;
15+
private int SEARCH_NUM = 0;
16+
1717
public SearchForm(MainForm mainForm)
1818
{
1919
InitializeComponent();
@@ -33,33 +33,42 @@ private void SearchButton_Click(object sender, EventArgs e)
3333
return;
3434
}
3535

36-
//一次新的查找
37-
if (SearchBox.Text.Trim() != Define.SEARCH_TEXT)
36+
//开始一次新的查找
37+
NewSearch();
38+
39+
//控制TextBox滚动，使选中的内容始终可见
40+
Define.MAIN_FORM.TextBox.ScrollToCaret();
41+
}
42+
43+
//一次新的查找
44+
private void NewSearch()
45+
{
46+
if (SearchBox.Text.Trim() != SEARCH_TEXT)
3847
{
39-
Define.SEARCH_TEXT = SearchBox.Text.Trim();
40-
Define.START_INDEX = -1;
41-
Define.SELECT_LENGTH = Define.SEARCH_TEXT.Length;
42-
Define.SEARCH_NUM = 0;
48+
SEARCH_TEXT = SearchBox.Text.Trim();
49+
START_INDEX = -1;
50+
SELECT_LENGTH = SEARCH_TEXT.Length;
51+
SEARCH_NUM = 0;
4352
}
4453

45-
Define.START_INDEX = Define.MAIN_FORM.TextBox.Text.IndexOf(Define.SEARCH_TEXT, Define.START_INDEX + 1);
54+
START_INDEX = Define.MAIN_FORM.TextBox.Text.IndexOf(SEARCH_TEXT, START_INDEX + 1);
4655

47-
if (Define.START_INDEX != -1)
56+
if (START_INDEX != -1)
4857
{
4958
//有查找结果
50-
Define.MAIN_FORM.TextBox.Select(Define.START_INDEX, Define.SELECT_LENGTH);
51-
Text = $"查找文本 (No.{++Define.SEARCH_NUM})";
59+
Define.MAIN_FORM.TextBox.Select(START_INDEX, SELECT_LENGTH);
60+
Text = $"查找文本 (No.{++SEARCH_NUM})";
5261
}
5362
else
5463
{
5564
//无查找结果或已到文本末尾
56-
Define.START_INDEX = Define.MAIN_FORM.TextBox.Text.IndexOf(Define.SEARCH_TEXT);
65+
START_INDEX = Define.MAIN_FORM.TextBox.Text.IndexOf(SEARCH_TEXT);
5766

58-
if (Define.START_INDEX != -1)
67+
if (START_INDEX != -1)
5968
{
6069
//已到文本末尾(提前查找一次)
61-
Define.MAIN_FORM.TextBox.Select(Define.START_INDEX, Define.SELECT_LENGTH);
62-
Define.SEARCH_NUM = 1;
70+
Define.MAIN_FORM.TextBox.Select(START_INDEX, SELECT_LENGTH);
71+
SEARCH_NUM = 1;
6372
Text = $"查找文本 (No.1)";
6473
}
6574
else
@@ -69,11 +78,7 @@ private void SearchButton_Click(object sender, EventArgs e)
6978
Text = $"查找文本 (无结果)";
7079
}
7180
}
72-
73-
//控制TextBox滚动，使选中的内容始终可见
74-
Define.MAIN_FORM.TextBox.ScrollToCaret();
7581
}
76-
7782
//热键
7883
private void SearchForm_KeyDown(object sender, KeyEventArgs e)
7984
{

0 commit comments

Comments
 (0)