Compare commits

..

No commits in common. "main" and "v0.3" have entirely different histories.
main ... v0.3

3 changed files with 7 additions and 44 deletions

View File

@ -45,22 +45,14 @@ namespace AwesomeEmailExtractor
User editedUser = new User(User.ID, loginTextBox.Text, (UserRoles)roleComboBox.SelectedIndex); User editedUser = new User(User.ID, loginTextBox.Text, (UserRoles)roleComboBox.SelectedIndex);
try if (passwordTextBox.Text != "")
{
adminUtils.editUser(editedUser, passwordTextBox.Text);
}
else
{ {
if (passwordTextBox.Text != "") adminUtils.editUser(editedUser);
{
adminUtils.editUser(editedUser, passwordTextBox.Text);
}
else
{
adminUtils.editUser(editedUser);
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
} }
this.Close(); this.Close();

12
MainForm.Designer.cs generated
View File

@ -43,7 +43,6 @@
this.administrationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.administrationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resultStatusStrip.SuspendLayout(); this.resultStatusStrip.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -125,8 +124,7 @@
// fileToolStripMenuItem // fileToolStripMenuItem
// //
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.exportResultToolStripMenuItem, this.exportResultToolStripMenuItem});
this.importToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(48, 20); this.fileToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
this.fileToolStripMenuItem.Text = "Файл"; this.fileToolStripMenuItem.Text = "Файл";
@ -184,13 +182,6 @@
this.helpToolStripMenuItem.Text = "Справка"; this.helpToolStripMenuItem.Text = "Справка";
this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); 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 // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -232,7 +223,6 @@
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem journalToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem journalToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem exportResultToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exportResultToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
} }
} }

View File

@ -111,24 +111,5 @@ namespace AwesomeEmailExtractor
HelpForm helpForm = FormManager.Current.CreateForm<HelpForm>(); HelpForm helpForm = FormManager.Current.CreateForm<HelpForm>();
helpForm.ShowDialog(this); 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;
}
}
} }
} }