Skip to content

Commit 8c30fbd

Browse files
jirkapokjirkapok
committed
Added confirmation dialog before execution of command before connect.
1 parent 9d68f09 commit 8c30fbd

5 files changed

Lines changed: 259 additions & 10 deletions

File tree

‎Source/Terminals/Forms/ConfirmExecution.Designer.cs‎

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

‎Source/Terminals/Forms/ConfirmExecution.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using System.Windows.Forms;
2+
3+
namespace Terminals.Forms
4+
{
5+
public partial class ConfirmExecution : Form
6+
{
7+
public ConfirmExecution()
8+
{
9+
InitializeComponent();
10+
}
11+
12+
public void AssignCommand(string commnadWithArgs)
13+
{
14+
this.commandTextBox.Text = commnadWithArgs;
15+
}
16+
}
17+
}

‎Source/Terminals/Forms/ConfirmExecution.resx‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
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
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
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
37+
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
41+
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
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎Source/Terminals/Forms/ConnectionsUiFactory.cs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,23 @@ private static void UpdateForceConsole(IFavorite favorite, ConnectionDefinition
156156

157157
private void CreateTerminalTab(IFavorite origin, IFavorite configured)
158158
{
159-
ExternalLinks.CallExecuteBeforeConnected(this.settings);
160-
ExternalLinks.CallExecuteBeforeConnected(configured.ExecuteBeforeConnect);
159+
ExternalLinks.CallExecuteBeforeConnected(this.settings, this.ConfirmExecution);
160+
ExternalLinks.CallExecuteBeforeConnected(configured.ExecuteBeforeConnect, this.ConfirmExecution);
161161
TerminalTabControlItem terminalTabPage = CreateTerminalTabPageByFavoriteName(configured);
162162
this.TryConnectTabPage(origin, configured, terminalTabPage);
163163
}
164164

165+
private bool ConfirmExecution(IBeforeConnectExecuteOptions executeOptions)
166+
{
167+
using (var confirmDialog = new ConfirmExecution())
168+
{
169+
var commandWithArgs = $"{executeOptions.Command} {executeOptions.CommandArguments}";
170+
confirmDialog.AssignCommand(commandWithArgs);
171+
var result = confirmDialog.ShowDialog(this.mainForm);
172+
return result == DialogResult.Yes;
173+
}
174+
}
175+
165176
private TerminalTabControlItem CreateTerminalTabPageByFavoriteName(IFavorite favorite)
166177
{
167178
String terminalTabTitle = favorite.Name;

‎Source/Terminals/Services/ExternalLinks.cs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,25 @@ internal static void OpenLogsFolder()
5353
OpenPath(FileLocations.LogDirectory);
5454
}
5555

56-
internal static void CallExecuteBeforeConnected(IBeforeConnectExecuteOptions executeOptions)
56+
internal static void CallExecuteBeforeConnected(IBeforeConnectExecuteOptions executeOptions, Func<IBeforeConnectExecuteOptions, bool> userConfirm)
5757
{
5858
if (executeOptions.Execute && !string.IsNullOrEmpty(executeOptions.Command))
5959
{
60-
var processStartInfo = new ProcessStartInfo(executeOptions.Command, executeOptions.CommandArguments);
61-
processStartInfo.WorkingDirectory = executeOptions.InitialDirectory;
62-
Process process = Process.Start(processStartInfo);
63-
if (executeOptions.WaitForExit)
64-
{
65-
process.WaitForExit();
66-
}
60+
if (!userConfirm(executeOptions))
61+
return;
62+
63+
ExecuteProcess(executeOptions);
64+
}
65+
}
66+
67+
private static void ExecuteProcess(IBeforeConnectExecuteOptions executeOptions)
68+
{
69+
var processStartInfo = new ProcessStartInfo(executeOptions.Command, executeOptions.CommandArguments);
70+
processStartInfo.WorkingDirectory = executeOptions.InitialDirectory;
71+
Process process = Process.Start(processStartInfo);
72+
if (executeOptions.WaitForExit)
73+
{
74+
process.WaitForExit();
6775
}
6876
}
6977

0 commit comments

Comments
 (0)