diff --git a/AyaNovaQBI/CopyableMessageBox.Designer.cs b/AyaNovaQBI/CopyableMessageBox.Designer.cs index 74b597e..6aa270c 100644 --- a/AyaNovaQBI/CopyableMessageBox.Designer.cs +++ b/AyaNovaQBI/CopyableMessageBox.Designer.cs @@ -32,6 +32,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.btnCopy = new System.Windows.Forms.Button(); + this.btnOK = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.SuspendLayout(); @@ -58,6 +59,7 @@ // // panel2 // + this.panel2.Controls.Add(this.btnOK); this.panel2.Controls.Add(this.btnCopy); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel2.Location = new System.Drawing.Point(0, 281); @@ -67,21 +69,34 @@ // // btnCopy // - this.btnCopy.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.btnCopy.Location = new System.Drawing.Point(135, 23); + this.btnCopy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btnCopy.AutoSize = true; + this.btnCopy.Location = new System.Drawing.Point(12, 36); this.btnCopy.Name = "btnCopy"; - this.btnCopy.Size = new System.Drawing.Size(208, 40); + this.btnCopy.Size = new System.Drawing.Size(112, 23); this.btnCopy.TabIndex = 0; this.btnCopy.Text = "Copy all to clipboard"; this.btnCopy.UseVisualStyleBackColor = true; this.btnCopy.Click += new System.EventHandler(this.btnCopy_Click); // + // btnOK + // + this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnOK.Location = new System.Drawing.Point(389, 36); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.TabIndex = 17; + this.btnOK.Text = "OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // // CopyableMessageBox // + this.AcceptButton = this.btnOK; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btnOK; this.ClientSize = new System.Drawing.Size(488, 356); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -90,6 +105,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); } @@ -100,5 +116,6 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btnCopy; + private System.Windows.Forms.Button btnOK; } } \ No newline at end of file diff --git a/AyaNovaQBI/CopyableMessageBox.cs b/AyaNovaQBI/CopyableMessageBox.cs index 19a7347..e2222d0 100644 --- a/AyaNovaQBI/CopyableMessageBox.cs +++ b/AyaNovaQBI/CopyableMessageBox.cs @@ -17,7 +17,8 @@ namespace AyaNovaQBI { InitializeComponent(); mDisplay=Display; - this.Icon = AyaNovaQBI.Properties.Resources.logo; + Icon = AyaNovaQBI.Properties.Resources.logo; + btnOK.Text = util.AyaTranslations["OK"]; } private void btnCopy_Click(object sender, EventArgs e) @@ -30,5 +31,11 @@ namespace AyaNovaQBI edOut.Text = mDisplay; } + + private void btnOK_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + Close(); + } } } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index b6cd00c..ff7f5b0 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -1350,7 +1350,7 @@ namespace AyaNovaQBI //QBIntegration.Concurrency = r.ObjectResponse["data"]["concurrency"].Value(); //////Case 299 ////QBI.AIObject = QDat.XMLData; - //////QBI.AIObject=QDat; + //////QBI.AIObject=QDat; ////QBI = (Integration)QBI.Save(); //QDat.IsDirty = false;