merged changes, remove unneccessary functions
This commit is contained in:
5
Form1.Designer.cs
generated
5
Form1.Designer.cs
generated
@@ -56,7 +56,7 @@ namespace it_projekt
|
|||||||
this.loginBtn.TabIndex = 0;
|
this.loginBtn.TabIndex = 0;
|
||||||
this.loginBtn.Text = "Login";
|
this.loginBtn.Text = "Login";
|
||||||
this.loginBtn.UseVisualStyleBackColor = true;
|
this.loginBtn.UseVisualStyleBackColor = true;
|
||||||
this.loginBtn.Click += new System.EventHandler(this.loginBtn_Click);
|
this.loginBtn.Click += new System.EventHandler(this.LoadUsersFromTable);
|
||||||
//
|
//
|
||||||
// exportBtn
|
// exportBtn
|
||||||
//
|
//
|
||||||
@@ -174,7 +174,6 @@ namespace it_projekt
|
|||||||
this.jsonRBtn.TabStop = true;
|
this.jsonRBtn.TabStop = true;
|
||||||
this.jsonRBtn.Text = "JSON";
|
this.jsonRBtn.Text = "JSON";
|
||||||
this.jsonRBtn.UseVisualStyleBackColor = true;
|
this.jsonRBtn.UseVisualStyleBackColor = true;
|
||||||
this.jsonRBtn.CheckedChanged += new System.EventHandler(this.jsonRBtn_CheckedChanged);
|
|
||||||
//
|
//
|
||||||
// xmlRBtn
|
// xmlRBtn
|
||||||
//
|
//
|
||||||
@@ -185,7 +184,6 @@ namespace it_projekt
|
|||||||
this.xmlRBtn.TabIndex = 9;
|
this.xmlRBtn.TabIndex = 9;
|
||||||
this.xmlRBtn.Text = "XML";
|
this.xmlRBtn.Text = "XML";
|
||||||
this.xmlRBtn.UseVisualStyleBackColor = true;
|
this.xmlRBtn.UseVisualStyleBackColor = true;
|
||||||
this.xmlRBtn.CheckedChanged += new System.EventHandler(this.xmlRBtn_CheckedChanged);
|
|
||||||
//
|
//
|
||||||
// Form1
|
// Form1
|
||||||
//
|
//
|
||||||
@@ -203,7 +201,6 @@ namespace it_projekt
|
|||||||
this.Controls.Add(this.loginBtn);
|
this.Controls.Add(this.loginBtn);
|
||||||
this.Name = "Form1";
|
this.Name = "Form1";
|
||||||
this.Text = "Form1";
|
this.Text = "Form1";
|
||||||
this.Load += new System.EventHandler(this.Form1_Load);
|
|
||||||
((System.ComponentModel.ISupportInitialize)(this.dataGrid)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.dataGrid)).EndInit();
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
this.PerformLayout();
|
||||||
|
|||||||
36
Form1.cs
36
Form1.cs
@@ -27,16 +27,10 @@ namespace it_projekt
|
|||||||
export("All files (*.*)|*.*|xml files (*.xml)|*.xml", "benutzer.xml");
|
export("All files (*.*)|*.*|xml files (*.xml)|*.xml", "benutzer.xml");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loginBtn_Click(object sender, EventArgs e)
|
|
||||||
|
public void LoadUsersFromTable(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
LoadUsersFromTable(this.userTxt.Text, this.passTxt.Text);
|
db = Database.getDatabase(this.userTxt.Text, this.passTxt.Text);
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void LoadUsersFromTable(string user, string password)
|
|
||||||
{
|
|
||||||
db = Database.getDatabase(user, password);
|
|
||||||
if (db.Persons == null)
|
if (db.Persons == null)
|
||||||
{
|
{
|
||||||
Database.resetDatabase();
|
Database.resetDatabase();
|
||||||
@@ -52,16 +46,6 @@ namespace it_projekt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dataGrid_CellContentClick(object sender, DataGridViewCellEventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private System.EventHandler test()
|
|
||||||
{
|
|
||||||
this.exportBtn.Enabled = false;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void export(string Filter, string FileName)
|
private void export(string Filter, string FileName)
|
||||||
{
|
{
|
||||||
@@ -109,20 +93,6 @@ namespace it_projekt
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void Form1_Load(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void jsonRBtn_CheckedChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void xmlRBtn_CheckedChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
private void DataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
|
private void DataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
|
||||||
{
|
{
|
||||||
//Check to ensure that the row CheckBox is clicked.
|
//Check to ensure that the row CheckBox is clicked.
|
||||||
|
|||||||
Reference in New Issue
Block a user