diff --git a/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.Designer.cs b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.Designer.cs new file mode 100644 index 0000000..1257181 --- /dev/null +++ b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.Designer.cs @@ -0,0 +1,83 @@ +namespace VisualComponentsForm +{ + partial class FormCreateDiscipline + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + textBoxDiscipline = new TextBox(); + label1 = new Label(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(12, 12); + dataGridView.Name = "dataGridView"; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(234, 225); + dataGridView.TabIndex = 0; + // + // textBoxDiscipline + // + textBoxDiscipline.Location = new Point(266, 30); + textBoxDiscipline.Name = "textBoxDiscipline"; + textBoxDiscipline.Size = new Size(100, 23); + textBoxDiscipline.TabIndex = 1; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(252, 12); + label1.Name = "label1"; + label1.Size = new Size(132, 15); + label1.TabIndex = 2; + label1.Text = "Название дисциплины"; + // + // CreateDiscipline + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(391, 249); + Controls.Add(label1); + Controls.Add(textBoxDiscipline); + Controls.Add(dataGridView); + Name = "CreateDiscipline"; + Text = "Создание дисциплин"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DataGridView dataGridView; + private TextBox textBoxDiscipline; + private Label label1; + } +} \ No newline at end of file diff --git a/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.cs b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.cs new file mode 100644 index 0000000..7920d12 --- /dev/null +++ b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace VisualComponentsForm +{ + public partial class FormCreateDiscipline : Form + { + public FormCreateDiscipline() + { + InitializeComponent(); + } + } +} diff --git a/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.resx b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/VisualComponentsForm/VisualComponentsForm/FormCreateDiscipline.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/VisualComponentsForm/VisualComponentsForm/FormMain.Designer.cs b/VisualComponentsForm/VisualComponentsForm/FormMain.Designer.cs index 82264ef..a204b7f 100644 --- a/VisualComponentsForm/VisualComponentsForm/FormMain.Designer.cs +++ b/VisualComponentsForm/VisualComponentsForm/FormMain.Designer.cs @@ -39,6 +39,7 @@ lineChartExcel = new NonVisualComponents.LineChartExcel(components); pdfTable = new NonVisualComponents.PdfTable(components); componentWord = new VisualComponentsLib.Components.ComponentWord(components); + button1 = new Button(); groupBox.SuspendLayout(); SuspendLayout(); // @@ -117,14 +118,26 @@ // pdfTable.Error = null; // + // button1 + // + button1.Location = new Point(407, 24); + button1.Name = "button1"; + button1.Size = new Size(75, 23); + button1.TabIndex = 8; + button1.Text = "button1"; + button1.UseVisualStyleBackColor = true; + button1.Click += Button1_Click; + // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1059, 412); + ClientSize = new Size(529, 412); + Controls.Add(button1); Controls.Add(groupBox); Name = "FormMain"; Text = "Главная"; + KeyDown += FormMain_KeyDown; groupBox.ResumeLayout(false); groupBox.PerformLayout(); ResumeLayout(false); @@ -141,5 +154,6 @@ private NonVisualComponents.LineChartExcel lineChartExcel; private NonVisualComponents.PdfTable pdfTable; private VisualComponentsLib.Components.ComponentWord componentWord; + private Button button1; } } \ No newline at end of file diff --git a/VisualComponentsForm/VisualComponentsForm/FormMain.cs b/VisualComponentsForm/VisualComponentsForm/FormMain.cs index 502884a..856cf28 100644 --- a/VisualComponentsForm/VisualComponentsForm/FormMain.cs +++ b/VisualComponentsForm/VisualComponentsForm/FormMain.cs @@ -50,5 +50,48 @@ namespace VisualComponentsForm { myListBox.ClearAll(); } + + private void FormMain_KeyDown(object sender, KeyEventArgs e) + { + if (e.Control) + { + if (e.KeyCode == Keys.A) + { + //createOrderEntityItem_Click(sender, e); + } + if (e.KeyCode == Keys.U) + { + //updateOrderEntityItem_Click(sender, e); + } + if (e.KeyCode == Keys.D) + { + //deleteOrderEntityItem_Click(sender, e); + } + if (e.KeyCode == Keys.S) + { + //createSimpleDocItem_Click(sender, e); + } + if (e.KeyCode == Keys.T) + { + //createTableDocEntityItem_Click(sender, e); + } + if (e.KeyCode == Keys.C) + { + //createChartDocEntityItem_Click(sender, e); + } + } + } + + private void Button1_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateDiscipline)); + + if (service is FormCreateDiscipline form) + { + form.ShowDialog(); + + //LoadData(); + } + } } } \ No newline at end of file diff --git a/VisualComponentsForm/VisualComponentsForm/Program.cs b/VisualComponentsForm/VisualComponentsForm/Program.cs index d482b61..984a885 100644 --- a/VisualComponentsForm/VisualComponentsForm/Program.cs +++ b/VisualComponentsForm/VisualComponentsForm/Program.cs @@ -24,7 +24,7 @@ namespace VisualComponentsForm ConfigureServices(services); _serviceProvider = services.BuildServiceProvider(); - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(_serviceProvider.GetRequiredService()); } private static void ConfigureServices(ServiceCollection services) @@ -32,7 +32,7 @@ namespace VisualComponentsForm services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file