diff --git a/TimeTable/view/Decide.Designer.cs b/TimeTable/view/Decide.Designer.cs index a6eac03..58226a7 100644 --- a/TimeTable/view/Decide.Designer.cs +++ b/TimeTable/view/Decide.Designer.cs @@ -1,4 +1,6 @@ using System.Drawing; +using TimeTable.controll; +using TimeTable.model; namespace TimeTable.view { partial class decide { @@ -7,6 +9,10 @@ namespace TimeTable.view { /// private System.ComponentModel.IContainer components = null; + public decide(string uid) { + InitializeComponent(); + } + /// /// Clean up any resources being used. /// @@ -91,6 +97,7 @@ namespace TimeTable.view { Controls.Add(cancelBtn); Controls.Add(resumeBtn); Controls.Add(stopBtn); + FormBorderStyle = FormBorderStyle.FixedSingle; Name = "decide"; Text = "What to do?"; ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); @@ -98,6 +105,21 @@ namespace TimeTable.view { PerformLayout(); } + + + private void btnStopClick(object sender, EventArgs e) { + + } + + + private void btnResumeClick(object sender, EventArgs e) { + } + + + private void btnCancelClick(object sender, EventArgs e) { + this.Close(); + } + #endregion private Button stopBtn; diff --git a/TimeTable/view/Decide.resx b/TimeTable/view/Decide.resx index 3f58db7..3093c2b 100644 --- a/TimeTable/view/Decide.resx +++ b/TimeTable/view/Decide.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAS - cwAAEnMBjCK5BwAAC61JREFUWEftmHlU1OUax9l3EVNSLFOQRdnUtGOuiQiGqVcxwOOSmiRWrmGYy+1e + cgAAEnIBXmVb4wAAC61JREFUWEftmHlU1OUax9l3EVNSLFOQRdnUtGOuiQiGqVcxwOOSmiRWrmGYy+1e j1YmpmJiKJusIjvMMAMzMAsMzLBvCkKiIg6boCIMLjDfc5/fDNbpHG91S/P+0XPO5/x+83u3L8/7Ps/7 vmj8bX/b7zBHZyfDj/z8PLZt23Zw7dq1q6dOnTaaPmuqS1+yWVtbawQFBc1JTU2TZWfn9MXGxt1YudJz IxWZqmu8ZHNychoXGXkhlcQN8vkFEAgEym+/Dayi725UrKeu9ZLM2NhY59y5c/7p6awBLjcFkoIdyM1N diff --git a/TimeTable/view/Main.Designer.cs b/TimeTable/view/Main.Designer.cs index 6a1d349..d2dceb1 100644 --- a/TimeTable/view/Main.Designer.cs +++ b/TimeTable/view/Main.Designer.cs @@ -117,7 +117,7 @@ namespace TimeTable { taskTimeGridView.RowHeadersWidth = 51; taskTimeGridView.Size = new Size(631, 378); taskTimeGridView.TabIndex = 0; - taskTimeGridView.CellContentDoubleClick += TimetableEditDoubleClick; + taskTimeGridView.CellDoubleClick += TimetableEditDoubleClick; // // con // @@ -190,7 +190,8 @@ namespace TimeTable { RowEdit rowEdit = new RowEdit(); rowEdit.Data(uid, start, end, text); - rowEdit.Show(); + + rowEdit.ShowDialog(); } private void executeSql(string command) { diff --git a/TimeTable/view/TextInsert.Designer.cs b/TimeTable/view/TextInsert.Designer.cs new file mode 100644 index 0000000..faff4a2 --- /dev/null +++ b/TimeTable/view/TextInsert.Designer.cs @@ -0,0 +1,64 @@ +namespace TimeTable.view { + partial class TextInsert { + /// + /// 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() { + label1 = new Label(); + textBox = new TextBox(); + SuspendLayout(); + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(12, 23); + label1.Name = "label1"; + label1.Size = new Size(36, 20); + label1.TabIndex = 0; + label1.Text = "Text"; + // + // textBox + // + textBox.Location = new Point(73, 20); + textBox.Name = "textBox"; + textBox.Size = new Size(392, 27); + textBox.TabIndex = 1; + // + // TextInsert + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(477, 68); + Controls.Add(textBox); + Controls.Add(label1); + Name = "TextInsert"; + Text = "Form1"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label label1; + private TextBox textBox; + } +} \ No newline at end of file diff --git a/TimeTable/view/TextInsert.cs b/TimeTable/view/TextInsert.cs new file mode 100644 index 0000000..9a37cb0 --- /dev/null +++ b/TimeTable/view/TextInsert.cs @@ -0,0 +1,7 @@ +namespace TimeTable.view { + public partial class TextInsert : Form { + public TextInsert() { + InitializeComponent(); + } + } +} diff --git a/TimeTable/view/TextInsert.resx b/TimeTable/view/TextInsert.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/TimeTable/view/TextInsert.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