Skip to content

Commit 3633506

Browse files
committed
fix minor bugs
1 parent 526bcde commit 3633506

File tree

4 files changed

+163
-137
lines changed

4 files changed

+163
-137
lines changed

UnderAutomation.Yaskawa.Showcase.Forms/Components/ConnectControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void btnConnect_Click(object sender, EventArgs e)
4141
if (e is KeyEventArgs && ((KeyEventArgs)e).KeyCode != Keys.Enter) return;
4242

4343
// Connect to the robot
44-
_robot.HighSpeedEServer.Connect(txtIP.Text);
44+
_robot.Connect(txtIP.Text);
4545

4646
// Store information
4747
Config.Current.IP = txtIP.Text;

UnderAutomation.Yaskawa.Showcase.Forms/Components/LicenseControl.Designer.cs

Lines changed: 118 additions & 108 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnderAutomation.Yaskawa.Showcase.Forms/Components/LicenseControl.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
using System.Windows.Forms;
1+
using System.Diagnostics;
2+
using System.Windows.Forms;
23
using UnderAutomation.Yaskawa;
4+
using UnderAutomation.Yaskawa.License;
35

46
public partial class LicenseControl : UserControl, IUserControl
57
{
@@ -53,4 +55,18 @@ private void btnSetLicense_Click(object sender, System.EventArgs e)
5355
Config.Current.Key = txtKey.Text;
5456
Config.Save();
5557
}
58+
59+
private void txtLicenseInfo_LinkClicked(object sender, LinkClickedEventArgs e)
60+
{
61+
try
62+
{
63+
var ps = new ProcessStartInfo(e.LinkText)
64+
{
65+
UseShellExecute = true,
66+
Verb = "open"
67+
};
68+
Process.Start(ps);
69+
}
70+
catch { }
71+
}
5672
}

UnderAutomation.Yaskawa.Showcase.Forms/Components/LicenseControl.resx

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12-
12+
1313
Example:
14-
14+
1515
... ado.net/XML headers & schema ...
1616
<resheader name="resmimetype">text/microsoft-resx</resheader>
1717
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
2626
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2727
<comment>This is a comment</comment>
2828
</data>
29-
30-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
3131
name/value pairs.
32-
33-
Each data row contains a name, and value. The row also contains a
34-
type or mimetype. Type corresponds to a .NET class that support
35-
text/value conversion through the TypeConverter architecture.
36-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3737
mimetype set.
38-
39-
The mimetype is used for serialized objects, and tells the
40-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
4141
extensible. For a given mimetype the value must be set accordingly:
42-
43-
Note - application/x-microsoft.net.object.binary.base64 is the format
44-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4545
read any of the formats listed below.
46-
46+
4747
mimetype: application/x-microsoft.net.object.binary.base64
48-
value : The object must be serialized with
48+
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
53-
value : The object must be serialized with
53+
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5555
: and then encoded with base64 encoding.
5656
5757
mimetype: application/x-microsoft.net.object.bytearray.base64
58-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5959
: using a System.ComponentModel.TypeConverter
6060
: and then encoded with base64 encoding.
6161
-->

0 commit comments

Comments
 (0)