Merge pull request #39 from PI20v/dev

добавляет импорт файла
2022-05-25 09:19:28 +03:00 · 2022-05-25 09:13:02 +03:00 · 2022-05-25 08:27:39 +03:00 · 2022-05-25 08:23:03 +03:00 · 2022-05-24 16:49:09 +03:00 · 2022-05-24 16:48:08 +03:00
7 changed files with 243 additions and 181 deletions
--- a/AdministrationForm.Designer.cs
+++ b/AdministrationForm.Designer.cs
@ -35,35 +35,35 @@
            this.pathToJournalTextBox = new System.Windows.Forms.TextBox();
            this.usersTabPage = new System.Windows.Forms.TabPage();
            this.usersDataGridView = new System.Windows.Forms.DataGridView();
-            this.journalTabPage = new System.Windows.Forms.TabPage();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.journalDataGridView = new System.Windows.Forms.DataGridView();
-            this.editUserButton = new System.Windows.Forms.Button();
            this.panel2 = new System.Windows.Forms.Panel();
            this.deleteUserButton = new System.Windows.Forms.Button();
-            this.sqliteCommand1 = new Microsoft.Data.Sqlite.SqliteCommand();
+            this.editUserButton = new System.Windows.Forms.Button();
+            this.journalTabPage = new System.Windows.Forms.TabPage();
            this.panel3 = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.messageRichTextBox = new System.Windows.Forms.RichTextBox();
+            this.journalDataGridView = new System.Windows.Forms.DataGridView();
            this.panel4 = new System.Windows.Forms.Panel();
            this.deleteJournalButton = new System.Windows.Forms.Button();
-            this.dateLabel = new System.Windows.Forms.Label();
-            this.userLabel = new System.Windows.Forms.Label();
+            this.panel1 = new System.Windows.Forms.Panel();
            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label2 = new System.Windows.Forms.Label();
+            this.messageRichTextBox = new System.Windows.Forms.RichTextBox();
+            this.userLabel = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.dateLabel = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
            this.actionLabel = new System.Windows.Forms.Label();
            this.label5 = new System.Windows.Forms.Label();
+            this.sqliteCommand1 = new Microsoft.Data.Sqlite.SqliteCommand();
            this.mainTabControl.SuspendLayout();
            this.mainSettingsTabPage.SuspendLayout();
            this.usersTabPage.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.usersDataGridView)).BeginInit();
-            this.journalTabPage.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.journalDataGridView)).BeginInit();
            this.panel2.SuspendLayout();
+            this.journalTabPage.SuspendLayout();
            this.panel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.journalDataGridView)).BeginInit();
            this.panel4.SuspendLayout();
+            this.panel1.SuspendLayout();
            this.tableLayoutPanel1.SuspendLayout();
            this.SuspendLayout();
            // 
@ -141,49 +141,6 @@
            this.usersDataGridView.Size = new System.Drawing.Size(984, 497);
            this.usersDataGridView.TabIndex = 0;
            // 
-            // journalTabPage
-            // 
-            this.journalTabPage.Controls.Add(this.panel3);
-            this.journalTabPage.Controls.Add(this.panel1);
-            this.journalTabPage.Location = new System.Drawing.Point(4, 22);
-            this.journalTabPage.Name = "journalTabPage";
-            this.journalTabPage.Size = new System.Drawing.Size(990, 531);
-            this.journalTabPage.TabIndex = 2;
-            this.journalTabPage.Text = "Журнал";
-            this.journalTabPage.UseVisualStyleBackColor = true;
-            this.journalTabPage.Click += new System.EventHandler(this.journalTabPage_Click);
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.tableLayoutPanel1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel1.Location = new System.Drawing.Point(536, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(454, 531);
-            this.panel1.TabIndex = 1;
-            // 
-            // journalDataGridView
-            // 
-            this.journalDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.journalDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.journalDataGridView.Location = new System.Drawing.Point(0, 37);
-            this.journalDataGridView.Name = "journalDataGridView";
-            this.journalDataGridView.ReadOnly = true;
-            this.journalDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.journalDataGridView.Size = new System.Drawing.Size(536, 494);
-            this.journalDataGridView.TabIndex = 0;
-            this.journalDataGridView.SelectionChanged += new System.EventHandler(this.journalDataGridView_SelectionChanged);
-            // 
-            // editUserButton
-            // 
-            this.editUserButton.Location = new System.Drawing.Point(3, 3);
-            this.editUserButton.Name = "editUserButton";
-            this.editUserButton.Size = new System.Drawing.Size(131, 20);
-            this.editUserButton.TabIndex = 1;
-            this.editUserButton.Text = "Редактировать";
-            this.editUserButton.UseVisualStyleBackColor = true;
-            this.editUserButton.Click += new System.EventHandler(this.editUserButton_Click);
-            // 
            // panel2
            // 
            this.panel2.Controls.Add(this.deleteUserButton);
@ -204,12 +161,27 @@
            this.deleteUserButton.UseVisualStyleBackColor = true;
            this.deleteUserButton.Click += new System.EventHandler(this.deleteUserButton_Click);
            // 
-            // sqliteCommand1
+            // editUserButton
            // 
-            this.sqliteCommand1.CommandTimeout = 30;
-            this.sqliteCommand1.Connection = null;
-            this.sqliteCommand1.Transaction = null;
-            this.sqliteCommand1.UpdatedRowSource = System.Data.UpdateRowSource.None;
+            this.editUserButton.Location = new System.Drawing.Point(3, 3);
+            this.editUserButton.Name = "editUserButton";
+            this.editUserButton.Size = new System.Drawing.Size(131, 20);
+            this.editUserButton.TabIndex = 1;
+            this.editUserButton.Text = "Редактировать";
+            this.editUserButton.UseVisualStyleBackColor = true;
+            this.editUserButton.Click += new System.EventHandler(this.editUserButton_Click);
+            // 
+            // journalTabPage
+            // 
+            this.journalTabPage.Controls.Add(this.panel3);
+            this.journalTabPage.Controls.Add(this.panel1);
+            this.journalTabPage.Location = new System.Drawing.Point(4, 22);
+            this.journalTabPage.Name = "journalTabPage";
+            this.journalTabPage.Size = new System.Drawing.Size(990, 531);
+            this.journalTabPage.TabIndex = 2;
+            this.journalTabPage.Text = "Журнал";
+            this.journalTabPage.UseVisualStyleBackColor = true;
+            this.journalTabPage.Click += new System.EventHandler(this.journalTabPage_Click);
            // 
            // panel3
            // 
@ -221,41 +193,17 @@
            this.panel3.Size = new System.Drawing.Size(536, 531);
            this.panel3.TabIndex = 2;
            // 
-            // label2
+            // journalDataGridView
            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(3, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(36, 13);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "Дата:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(3, 30);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(83, 13);
-            this.label3.TabIndex = 1;
-            this.label3.Text = "Пользователь:";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(3, 60);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(54, 13);
-            this.label4.TabIndex = 2;
-            this.label4.Text = "Событие:";
-            // 
-            // messageRichTextBox
-            // 
-            this.messageRichTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.messageRichTextBox.Location = new System.Drawing.Point(103, 93);
-            this.messageRichTextBox.Name = "messageRichTextBox";
-            this.messageRichTextBox.Size = new System.Drawing.Size(348, 435);
-            this.messageRichTextBox.TabIndex = 3;
-            this.messageRichTextBox.Text = "";
+            this.journalDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.journalDataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.journalDataGridView.Location = new System.Drawing.Point(0, 37);
+            this.journalDataGridView.Name = "journalDataGridView";
+            this.journalDataGridView.ReadOnly = true;
+            this.journalDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.journalDataGridView.Size = new System.Drawing.Size(536, 494);
+            this.journalDataGridView.TabIndex = 0;
+            this.journalDataGridView.SelectionChanged += new System.EventHandler(this.journalDataGridView_SelectionChanged);
            // 
            // panel4
            // 
@ -276,21 +224,14 @@
            this.deleteJournalButton.UseVisualStyleBackColor = true;
            this.deleteJournalButton.Click += new System.EventHandler(this.deleteJournalButton_Click);
            // 
-            // dateLabel
+            // panel1
            // 
-            this.dateLabel.AutoSize = true;
-            this.dateLabel.Location = new System.Drawing.Point(103, 0);
-            this.dateLabel.Name = "dateLabel";
-            this.dateLabel.Size = new System.Drawing.Size(0, 13);
-            this.dateLabel.TabIndex = 4;
-            // 
-            // userLabel
-            // 
-            this.userLabel.AutoSize = true;
-            this.userLabel.Location = new System.Drawing.Point(103, 30);
-            this.userLabel.Name = "userLabel";
-            this.userLabel.Size = new System.Drawing.Size(0, 13);
-            this.userLabel.TabIndex = 5;
+            this.panel1.Controls.Add(this.tableLayoutPanel1);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel1.Location = new System.Drawing.Point(536, 0);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(454, 531);
+            this.panel1.TabIndex = 1;
            // 
            // tableLayoutPanel1
            // 
@ -316,6 +257,59 @@
            this.tableLayoutPanel1.Size = new System.Drawing.Size(454, 531);
            this.tableLayoutPanel1.TabIndex = 6;
            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(3, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(36, 13);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "Дата:";
+            // 
+            // messageRichTextBox
+            // 
+            this.messageRichTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.messageRichTextBox.Location = new System.Drawing.Point(103, 93);
+            this.messageRichTextBox.Name = "messageRichTextBox";
+            this.messageRichTextBox.ReadOnly = true;
+            this.messageRichTextBox.Size = new System.Drawing.Size(348, 435);
+            this.messageRichTextBox.TabIndex = 3;
+            this.messageRichTextBox.Text = "";
+            // 
+            // userLabel
+            // 
+            this.userLabel.AutoSize = true;
+            this.userLabel.Location = new System.Drawing.Point(103, 30);
+            this.userLabel.Name = "userLabel";
+            this.userLabel.Size = new System.Drawing.Size(0, 13);
+            this.userLabel.TabIndex = 5;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(3, 60);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(54, 13);
+            this.label4.TabIndex = 2;
+            this.label4.Text = "Событие:";
+            // 
+            // dateLabel
+            // 
+            this.dateLabel.AutoSize = true;
+            this.dateLabel.Location = new System.Drawing.Point(103, 0);
+            this.dateLabel.Name = "dateLabel";
+            this.dateLabel.Size = new System.Drawing.Size(0, 13);
+            this.dateLabel.TabIndex = 4;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(3, 30);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(83, 13);
+            this.label3.TabIndex = 1;
+            this.label3.Text = "Пользователь:";
+            // 
            // actionLabel
            // 
            this.actionLabel.AutoSize = true;
@ -333,6 +327,13 @@
            this.label5.TabIndex = 7;
            this.label5.Text = "Сообщение:";
            // 
+            // sqliteCommand1
+            // 
+            this.sqliteCommand1.CommandTimeout = 30;
+            this.sqliteCommand1.Connection = null;
+            this.sqliteCommand1.Transaction = null;
+            this.sqliteCommand1.UpdatedRowSource = System.Data.UpdateRowSource.None;
+            // 
            // AdministrationForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -347,12 +348,12 @@
            this.mainSettingsTabPage.PerformLayout();
            this.usersTabPage.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.usersDataGridView)).EndInit();
-            this.journalTabPage.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.journalDataGridView)).EndInit();
            this.panel2.ResumeLayout(false);
+            this.journalTabPage.ResumeLayout(false);
            this.panel3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.journalDataGridView)).EndInit();
            this.panel4.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
            this.tableLayoutPanel1.ResumeLayout(false);
            this.tableLayoutPanel1.PerformLayout();
            this.ResumeLayout(false);
--- a/EditUserForm.cs
+++ b/EditUserForm.cs
@ -45,14 +45,22 @@ namespace AwesomeEmailExtractor

            User editedUser = new User(User.ID, loginTextBox.Text, (UserRoles)roleComboBox.SelectedIndex);

-            if (passwordTextBox.Text != "")
-            {
-                adminUtils.editUser(editedUser, passwordTextBox.Text);
-            }
-            else
+            try
            {

-                adminUtils.editUser(editedUser);
+                if (passwordTextBox.Text != "")
+                {
+                    adminUtils.editUser(editedUser, passwordTextBox.Text);
+                }
+                else
+                {
+                    adminUtils.editUser(editedUser);
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
            }

            this.Close();
--- a/HelpForm.resx
+++ b/HelpForm.resx
@ -118,8 +118,8 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <data name="label1.Text" xml:space="preserve">
-    <value>Программный продукт AwesomeEmailExtractor будет востребован в тех случаях, когда необхимо из текста получить список уникальных e-mail-ов.
-Для того, чтобы получить список, необходимо ввести исходный текст и нажать кнопку "Выполнить". После этого, в правой части окна появится список из уникальных e-mail-ов.
+    <value>Программный продукт AwesomeEmailExtractor будет востребован в тех случаях, когда необходимо из текста получить список уникальных e-mail-ов.
+Для того чтобы получить список, необходимо ввести исходный текст и нажать кнопку "Выполнить". После этого, в правой части окна появится список из уникальных e-mail-ов.
 При необходимости можно экспортировать результат выполнения программы с помощью меню "Файл" &gt; "Экспортировать результат".
 Во время своей работы программа ведет журнал активности пользователя. Это может быть полезно, чтобы узнать, какие до этого были результаты выполнения. "Аккаунт" -&gt; "Журнал".
 Для смены пароля или удаления аккаунта необходимо выбрать в меню "Аккаунт" -&gt; "Настройки".
--- a/JournalForm.Designer.cs
+++ b/JournalForm.Designer.cs
@ -30,13 +30,13 @@
        {
            this.dataGridView1 = new System.Windows.Forms.DataGridView();
            this.panel1 = new System.Windows.Forms.Panel();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
            this.label3 = new System.Windows.Forms.Label();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
            this.dataLabel = new System.Windows.Forms.Label();
            this.actionLabel = new System.Windows.Forms.Label();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label2 = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
            this.panel1.SuspendLayout();
            this.tableLayoutPanel1.SuspendLayout();
@ -64,60 +64,6 @@
            this.panel1.Size = new System.Drawing.Size(458, 451);
            this.panel1.TabIndex = 1;
            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(13, 10);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(36, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Дата:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(13, 30);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(54, 13);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Событие:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(13, 50);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(68, 13);
-            this.label3.TabIndex = 4;
-            this.label3.Text = "Сообщение:";
-            // 
-            // dataLabel
-            // 
-            this.dataLabel.AutoSize = true;
-            this.dataLabel.Location = new System.Drawing.Point(141, 10);
-            this.dataLabel.Name = "dataLabel";
-            this.dataLabel.Size = new System.Drawing.Size(54, 13);
-            this.dataLabel.TabIndex = 5;
-            this.dataLabel.Text = "dataLabel";
-            // 
-            // actionLabel
-            // 
-            this.actionLabel.AutoSize = true;
-            this.actionLabel.Location = new System.Drawing.Point(141, 30);
-            this.actionLabel.Name = "actionLabel";
-            this.actionLabel.Size = new System.Drawing.Size(62, 13);
-            this.actionLabel.TabIndex = 6;
-            this.actionLabel.Text = "actionLabel";
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.richTextBox1.Location = new System.Drawing.Point(141, 53);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(304, 385);
-            this.richTextBox1.TabIndex = 7;
-            this.richTextBox1.Text = "";
-            // 
            // tableLayoutPanel1
            // 
            this.tableLayoutPanel1.ColumnCount = 2;
@ -140,6 +86,61 @@
            this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 451);
            this.tableLayoutPanel1.TabIndex = 8;
            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(13, 10);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(36, 13);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Дата:";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(13, 50);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(68, 13);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "Сообщение:";
+            // 
+            // richTextBox1
+            // 
+            this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.richTextBox1.Location = new System.Drawing.Point(141, 53);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.ReadOnly = true;
+            this.richTextBox1.Size = new System.Drawing.Size(304, 385);
+            this.richTextBox1.TabIndex = 7;
+            this.richTextBox1.Text = "";
+            // 
+            // dataLabel
+            // 
+            this.dataLabel.AutoSize = true;
+            this.dataLabel.Location = new System.Drawing.Point(141, 10);
+            this.dataLabel.Name = "dataLabel";
+            this.dataLabel.Size = new System.Drawing.Size(54, 13);
+            this.dataLabel.TabIndex = 5;
+            this.dataLabel.Text = "dataLabel";
+            // 
+            // actionLabel
+            // 
+            this.actionLabel.AutoSize = true;
+            this.actionLabel.Location = new System.Drawing.Point(141, 30);
+            this.actionLabel.Name = "actionLabel";
+            this.actionLabel.Size = new System.Drawing.Size(62, 13);
+            this.actionLabel.TabIndex = 6;
+            this.actionLabel.Text = "actionLabel";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(13, 30);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(54, 13);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "Событие:";
+            // 
            // JournalForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@ -43,6 +43,7 @@
            this.administrationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.resultStatusStrip.SuspendLayout();
            this.menuStrip1.SuspendLayout();
            this.SuspendLayout();
@ -124,7 +125,8 @@
            // fileToolStripMenuItem
            // 
            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.exportResultToolStripMenuItem});
+            this.exportResultToolStripMenuItem,
+            this.importToolStripMenuItem});
            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
            this.fileToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
            this.fileToolStripMenuItem.Text = "Файл";
@ -182,6 +184,13 @@
            this.helpToolStripMenuItem.Text = "Справка";
            this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click);
            // 
+            // importToolStripMenuItem
+            // 
+            this.importToolStripMenuItem.Name = "importToolStripMenuItem";
+            this.importToolStripMenuItem.Size = new System.Drawing.Size(219, 22);
+            this.importToolStripMenuItem.Text = "Импортировать файл";
+            this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
+            // 
            // MainForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -196,7 +205,7 @@
            this.MainMenuStrip = this.menuStrip1;
            this.MinimumSize = new System.Drawing.Size(642, 438);
            this.Name = "MainForm";
-            this.Text = "Main Form";
+            this.Text = "Главное окно";
            this.resultStatusStrip.ResumeLayout(false);
            this.resultStatusStrip.PerformLayout();
            this.menuStrip1.ResumeLayout(false);
@ -223,6 +232,7 @@
        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem journalToolStripMenuItem;
        private System.Windows.Forms.ToolStripMenuItem exportResultToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
    }
 }

--- a/MainForm.cs
+++ b/MainForm.cs
@ -111,5 +111,24 @@ namespace AwesomeEmailExtractor
            HelpForm helpForm = FormManager.Current.CreateForm<HelpForm>();
            helpForm.ShowDialog(this);
        }
+
+        private void importToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            // Показать окно с выбором файла
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "Текстовый файл (*.txt)|*.txt";
+
+            var res = openFileDialog.ShowDialog();
+
+            // Загрузить текст из файла
+            if (res == DialogResult.OK)
+            {
+                string fileName = openFileDialog.FileName;
+                string sourceText = System.IO.File.ReadAllText(fileName);
+
+                sourceRichTextBox.Text = sourceText;
+            }
+            
+        }
    }
 }
--- a/README.md
+++ b/README.md
@ -1 +1,24 @@
-# awesome-email-extractor
+# Awesome Email Extractor
+
+## О программе
+
+Смотри на [wiki](https://github.com/PI20v/awesome-email-extractor/wiki/%D0%9E-%D0%BF%D1%80%D0%BE%D0%B3%D1%80%D0%B0%D0%BC%D0%BC%D0%B5).
+
+## Как скачать и запустить
+
+### Для пользователей 
+
+1. Скачать архив с нужной версией из раздела [Releases](https://github.com/PI20v/awesome-email-extractor/releases);
+2. Распаковать в удобном месте;
+3. Запустить `AwesomeEmailExtractor.exe`.
+
+> Аккаунт администратора по умолчанию - `admin:admin`
+
+### Для разработчиков
+
+1. Скачать репозиторий;
+2. Открыть `AwesomeEmailExtractor.sln` в Visual Studio 2022.
+
+## Лицензия
+
+Распростроняется под MIT License. Дополнительную информацию см. в  `LICENSE.txt`.
Author	SHA1	Message	Date
Maxim Slipenko	6fdb00527c	Merge pull request #39 from PI20v/dev добавляет импорт файла	2022-05-25 09:19:28 +03:00
Maxim Slipenko	6442b02b27	добавляет импорт файла	2022-05-25 09:13:02 +03:00
Maxim Slipenko	9d0c1ccf59	Merge pull request #38 from PI20v/dev хотфикс	2022-05-25 08:27:39 +03:00
Maxim Slipenko	46cc1d3463	хотфикс	2022-05-25 08:23:03 +03:00
Maxim Slipenko	227f8a46bc	Merge pull request #37 from PI20v/dev Исправляет опечатки в тексте	2022-05-24 16:49:09 +03:00
Maxim Slipenko	fe4e192538	исправляет опечатки в тексте	2022-05-24 16:48:08 +03:00
Maxim Slipenko	cc449216a4	Merge pull request #35 from PI20v/dev 0.3	2022-05-24 16:14:07 +03:00
Maxim Slipenko	caaf57b46e	убирает редактируемость поля с сообщением fixes #36	2022-05-24 16:13:22 +03:00
Maxim Slipenko	fbb645930c	изменяет заголовок главного окна	2022-05-24 16:09:19 +03:00
Maxim Slipenko	736f677c4e	Update README.md	2022-05-24 16:08:19 +03:00
Maxim Slipenko	94c54bc727	Merge pull request #26 from PI20v/dev 0.2	2022-05-23 19:50:12 +03:00
Maxim Slipenko	4059b6e510	Merge pull request #16 from PI20v/dev 0.1	2022-05-19 16:22:53 +03:00