diff --git a/TypeClipboard/Form1.Designer.cs b/TypeClipboard/Form1.Designer.cs
index 6b4b924..aaad192 100644
--- a/TypeClipboard/Form1.Designer.cs
+++ b/TypeClipboard/Form1.Designer.cs
@@ -31,8 +31,9 @@
this.textBox1 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.chkHotkey = new System.Windows.Forms.CheckBox();
- this.textBox2 = new System.Windows.Forms.TextBox();
this.button2 = new System.Windows.Forms.Button();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.button3 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// textBox1
@@ -57,7 +58,7 @@
// chkHotkey
//
this.chkHotkey.AutoSize = true;
- this.chkHotkey.Location = new System.Drawing.Point(12, 41);
+ this.chkHotkey.Location = new System.Drawing.Point(213, 40);
this.chkHotkey.Name = "chkHotkey";
this.chkHotkey.Size = new System.Drawing.Size(109, 17);
this.chkHotkey.TabIndex = 2;
@@ -65,18 +66,9 @@
this.chkHotkey.UseVisualStyleBackColor = true;
this.chkHotkey.CheckedChanged += new System.EventHandler(this.chkHotkey_CheckedChanged);
//
- // textBox2
- //
- this.textBox2.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.textBox2.Location = new System.Drawing.Point(12, 64);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(201, 22);
- this.textBox2.TabIndex = 3;
- this.textBox2.Text = "(non-clipboard macro)";
- //
// button2
//
- this.button2.Location = new System.Drawing.Point(219, 64);
+ this.button2.Location = new System.Drawing.Point(219, 65);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(103, 22);
this.button2.TabIndex = 4;
@@ -84,12 +76,32 @@
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
+ // textBox2
+ //
+ this.textBox2.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.textBox2.Location = new System.Drawing.Point(12, 65);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.ReadOnly = true;
+ this.textBox2.Size = new System.Drawing.Size(201, 22);
+ this.textBox2.TabIndex = 5;
+ //
+ // button3
+ //
+ this.button3.Location = new System.Drawing.Point(12, 39);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(154, 22);
+ this.button3.TabIndex = 6;
+ this.button3.Text = "Copy clipboard to macro";
+ this.button3.UseVisualStyleBackColor = true;
+ this.button3.Click += new System.EventHandler(this.button3_Click);
+ //
// Form1
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(334, 99);
- this.Controls.Add(this.button2);
+ this.Controls.Add(this.button3);
this.Controls.Add(this.textBox2);
+ this.Controls.Add(this.button2);
this.Controls.Add(this.chkHotkey);
this.Controls.Add(this.button1);
this.Controls.Add(this.textBox1);
@@ -114,8 +126,9 @@
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.CheckBox chkHotkey;
- private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.Button button3;
}
}
diff --git a/TypeClipboard/Form1.cs b/TypeClipboard/Form1.cs
index 74e4fcc..7867b99 100644
--- a/TypeClipboard/Form1.cs
+++ b/TypeClipboard/Form1.cs
@@ -126,5 +126,11 @@ namespace TypeClipboard
{
_tc.Type(textBox2.Text);
}
+
+ private void button3_Click(object sender, EventArgs e)
+ {
+ String clipboard = Clipboard.GetText(TextDataFormat.UnicodeText);
+ textBox2.Text = clipboard;
+ }
}
}
diff --git a/TypeClipboard/Properties/AssemblyInfo.cs b/TypeClipboard/Properties/AssemblyInfo.cs
index dcaad5a..9aade3b 100644
--- a/TypeClipboard/Properties/AssemblyInfo.cs
+++ b/TypeClipboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.7.0")]
-[assembly: AssemblyFileVersion("1.3.7.0")]
+[assembly: AssemblyVersion("1.3.8.0")]
+[assembly: AssemblyFileVersion("1.3.8.0")]
diff --git a/TypeClipboardAppx/Package.appxmanifest b/TypeClipboardAppx/Package.appxmanifest
index 20d682d..8b3cc3f 100644
--- a/TypeClipboardAppx/Package.appxmanifest
+++ b/TypeClipboardAppx/Package.appxmanifest
@@ -9,7 +9,7 @@
+ Version="1.3.8.0" />
TypeClipboard