Skip to content

Commit 0b18ad1

Browse files
SpaceTimeeSpaceTimee
committed
1.1.10->1.2.0第1次更新
1 parent d2b853e commit 0b18ad1

72 files changed

Lines changed: 96 additions & 518 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Forms/MainForm.Designer.cs‎

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/MainForm.cs‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,18 @@ public MainForm(string[] args)
4242
InitializeComponent();
4343

4444
//欢迎界面和界面初始化
45-
MainFormInit();
45+
Task checkLiteModeTask = MainFormInit();
4646

4747
//拖拽至图标打开文件
4848
if (args.Length >= 1)
4949
{
5050
FILE_PATH = args[0];
51-
ImportFile();
51+
if (checkLiteModeTask != null)
52+
Task.WaitAll(checkLiteModeTask);
53+
Task.Run(ImportFile);
5254
}
5355
}
54-
private void MainFormInit()
56+
private Task MainFormInit()
5557
{
5658
//判断IsFirstRun的值
5759
if (Properties.Settings.Default.IsFirstRun)
@@ -62,10 +64,12 @@ private void MainFormInit()
6264
else
6365
{
6466
//不是第一次运行
65-
CheckOpacity();
66-
CheckDarkMode();
67-
CheckLiteMode();
67+
Task.Run(CheckDarkMode);
68+
Task.Run(CheckOpacity);
69+
return Task.Run(CheckLiteMode);
6870
}
71+
72+
return null;
6973
}
7074
private void Welcome()
7175
{
@@ -90,12 +94,6 @@ private void Welcome()
9094
Properties.Settings.Default.IsFirstRun = false;
9195
Properties.Settings.Default.Save();
9296
}
93-
private void CheckOpacity()
94-
{
95-
//设定Opacity的值
96-
Opacity = Properties.Settings.Default.Opacity;
97-
Properties.Settings.Default.Save();
98-
}
9997
private void CheckDarkMode()
10098
{
10199
if (Properties.Settings.Default.IsDarkMode)
@@ -107,6 +105,12 @@ private void CheckDarkMode()
107105
FunctionMenu.BackColor = Color.Gray;
108106
}
109107
}
108+
private void CheckOpacity()
109+
{
110+
//设定Opacity的值
111+
Opacity = Properties.Settings.Default.Opacity;
112+
Properties.Settings.Default.Save();
113+
}
110114
private void CheckLiteMode()
111115
{
112116
if (Properties.Settings.Default.IsLiteMode)
@@ -542,7 +546,9 @@ private void ImportFile()
542546
//读文件
543547
FileStream importer = new FileStream(FILE_PATH, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete);
544548
StreamReader reader = new StreamReader(importer);
549+
//写文本
545550
TextBox.Text = reader.ReadToEnd();
551+
TextBox.Select(0, 0);
546552

547553
Text = Path.GetFileName(FILE_PATH);
548554
CHANGE_MARK = false;

‎Forms/MainForm.resx‎

Lines changed: 3 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
6-
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
11-
associated with the data types.
12-
13-
Example:
14-
15-
... ado.net/XML headers & schema ...
16-
<resheader name="resmimetype">text/microsoft-resx</resheader>
17-
<resheader name="version">2.0</resheader>
18-
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19-
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20-
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21-
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22-
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23-
<value>[base64 mime encoded serialized .NET Framework object]</value>
24-
</data>
25-
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26-
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27-
<comment>This is a comment</comment>
28-
</data>
29-
30-
There are any number of "resheader" rows that contain simple
31-
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
37-
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
41-
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
45-
read any of the formats listed below.
46-
47-
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
49-
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50-
: and then encoded with base64 encoding.
51-
52-
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
54-
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55-
: and then encoded with base64 encoding.
56-
57-
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
59-
: using a System.ComponentModel.TypeConverter
60-
: and then encoded with base64 encoding.
61-
-->
1+
<root>
622
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
633
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
644
<xsd:element name="root" msdata:IsDataSet="true">
@@ -112,91 +52,17 @@
11252
<value>2.0</value>
11353
</resheader>
11454
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
55+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
11656
</resheader>
11757
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
58+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
11959
</resheader>
12060
<metadata name="TextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
12161
<value>True</value>
12262
</metadata>
12363
<metadata name="FunctionMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
12464
<value>17, 22</value>
12565
</metadata>
126-
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
127-
<data name="LiteMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
128-
<value>
129-
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
198-
</value>
199-
</data>
20066
<metadata name="TextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
20167
<value>315, 22</value>
20268
</metadata>

‎Forms/SearchForm.Designer.cs‎

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/SearchForm.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public SearchForm(MainForm mainForm)
2222
Define.MAIN_FORM = mainForm;
2323
}
2424

25+
26+
private void SearchBox_TextChanged(object sender, EventArgs e)
27+
{
28+
SearchButton.BackgroundImage = Vight_Note.Properties.Resources.Search;
29+
}
2530
private void SearchButton_Click(object sender, EventArgs e)
2631
{
2732
//输入结果为空
@@ -58,6 +63,7 @@ private void NewSearch()
5863
//有查找结果
5964
Define.MAIN_FORM.TextBox.Select(START_INDEX, SELECT_LENGTH);
6065
Text = $"查找文本 (No.{++SEARCH_NUM})";
66+
SearchButton.BackgroundImage = Vight_Note.Properties.Resources.Reduce;
6167
}
6268
else
6369
{
@@ -79,6 +85,7 @@ private void NewSearch()
7985
}
8086
}
8187
}
88+
8289
//热键
8390
private void SearchForm_KeyDown(object sender, KeyEventArgs e)
8491
{

0 commit comments

Comments
 (0)