Skip to content

Commit 63b1597

Browse files
thgosslerthgossler
committed
More menu items to copy tag values, some bug fixes, NuGet updates
1 parent fa73f34 commit 63b1597

File tree

7 files changed

+359
-88
lines changed

7 files changed

+359
-88
lines changed

‎AzTagger/AzTagger.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net9.0-windows7.0</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
7-
<Version>1.0.17.0</Version>
7+
<Version>1.0.18.0</Version>
88
<Authors>Thomas Gossler</Authors>
99
<Description>
1010
A Windows Desktop GUI application for fast and flexible querying of Azure resources
@@ -18,8 +18,8 @@
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
2020
<ApplicationIcon>images\icon.ico</ApplicationIcon>
21-
<AssemblyVersion>1.0.17.0</AssemblyVersion>
22-
<FileVersion>1.0.17.0</FileVersion>
21+
<AssemblyVersion>1.0.18.0</AssemblyVersion>
22+
<FileVersion>1.0.18.0</FileVersion>
2323
</PropertyGroup>
2424

2525

@@ -29,14 +29,14 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="Azure.Identity" Version="1.13.2" />
32-
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.9.0" />
33-
<PackageReference Include="Microsoft.Graph" Version="5.73.0" />
34-
<PackageReference Include="Microsoft.Identity.Client" Version="4.69.1" />
35-
<PackageReference Include="Azure.ResourceManager" Version="1.13.0" />
32+
<PackageReference Include="Azure.ResourceManager.Resources" Version="1.9.1" />
33+
<PackageReference Include="Microsoft.Graph" Version="5.77.0" />
34+
<PackageReference Include="Microsoft.Identity.Client" Version="4.71.1" />
35+
<PackageReference Include="Azure.ResourceManager" Version="1.13.1" />
3636
<PackageReference Include="Azure.ResourceManager.ResourceGraph" Version="1.0.1" />
3737
<PackageReference Include="Serilog" Version="4.2.0" />
38-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
39-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
38+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
39+
<PackageReference Include="System.Text.Json" Version="9.0.4" />
4040
</ItemGroup>
4141

4242
</Project>

‎AzTagger/InputDialog.cs‎

Lines changed: 65 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,81 @@ namespace AzTagger;
77
public class InputDialog : Form
88
{
99
private TextBox _txtInput;
10+
private Label _lblPrompt;
1011
private Button _btnOk;
1112
private Button _btnCancel;
1213

13-
public string InputText => _txtInput.Text;
14-
15-
public InputDialog(Form owner, string prompt)
14+
private void InitializeComponent()
1615
{
17-
Owner = owner;
18-
Text = "Save Query as...";
19-
Width = 400;
20-
Height = 150;
16+
_lblPrompt = new Label();
17+
_txtInput = new TextBox();
18+
_btnOk = new Button();
19+
_btnCancel = new Button();
20+
SuspendLayout();
21+
//
22+
// _lblPrompt
23+
//
24+
_lblPrompt.Location = new System.Drawing.Point(27, 26);
25+
_lblPrompt.Name = "_lblPrompt";
26+
_lblPrompt.Size = new System.Drawing.Size(518, 30);
27+
_lblPrompt.TabIndex = 0;
28+
_lblPrompt.Text = "<Input prompt:>";
29+
//
30+
// _txtInput
31+
//
32+
_txtInput.Location = new System.Drawing.Point(27, 61);
33+
_txtInput.Name = "_txtInput";
34+
_txtInput.Size = new System.Drawing.Size(534, 31);
35+
_txtInput.TabIndex = 1;
36+
//
37+
// _btnOk
38+
//
39+
_btnOk.Location = new System.Drawing.Point(330, 117);
40+
_btnOk.Name = "_btnOk";
41+
_btnOk.Size = new System.Drawing.Size(105, 42);
42+
_btnOk.TabIndex = 2;
43+
_btnOk.Text = "Ok";
44+
//
45+
// _btnCancel
46+
//
47+
_btnCancel.Location = new System.Drawing.Point(441, 117);
48+
_btnCancel.Name = "_btnCancel";
49+
_btnCancel.Size = new System.Drawing.Size(120, 42);
50+
_btnCancel.TabIndex = 3;
51+
_btnCancel.Text = "Cancel";
52+
//
53+
// InputDialog
54+
//
55+
AcceptButton = _btnOk;
56+
CancelButton = _btnCancel;
57+
ClientSize = new System.Drawing.Size(584, 181);
58+
ControlBox = false;
59+
Controls.Add(_lblPrompt);
60+
Controls.Add(_txtInput);
61+
Controls.Add(_btnOk);
62+
Controls.Add(_btnCancel);
2163
FormBorderStyle = FormBorderStyle.FixedDialog;
22-
StartPosition = FormStartPosition.CenterParent;
2364
MaximizeBox = false;
2465
MinimizeBox = false;
25-
ControlBox = false;
66+
Name = "InputDialog";
67+
StartPosition = FormStartPosition.CenterParent;
68+
Text = "<Dialog title>";
69+
ResumeLayout(false);
70+
PerformLayout();
71+
}
2672

27-
var lblPrompt = new Label() { Left = 10, Top = 10, Width = 360, Text = prompt };
28-
_txtInput = new TextBox() { Left = 10, Top = 30, Width = 360 };
29-
_btnOk = new Button() { Text = "Ok", Left = 210, Width = 75, Top = 60, Height = 29, DialogResult = DialogResult.OK };
30-
_btnCancel = new Button() { Text = "Cancel", Left = 295, Width = 75, Top = 60, Height = 29, DialogResult = DialogResult.Cancel };
73+
public string InputText => _txtInput.Text;
3174

32-
_btnOk.Click += (sender, e) => { Close(); };
33-
_btnCancel.Click += (sender, e) => { Close(); };
75+
public InputDialog(Form owner, string title, string prompt)
76+
{
77+
Owner = owner;
3478

35-
Controls.Add(lblPrompt);
36-
Controls.Add(_txtInput);
37-
Controls.Add(_btnOk);
38-
Controls.Add(_btnCancel);
79+
InitializeComponent();
3980

40-
AcceptButton = _btnOk;
41-
CancelButton = _btnCancel;
81+
Text = title;
82+
_lblPrompt.Text = prompt;
83+
84+
_btnOk.Click += (sender, e) => { Close(); };
85+
_btnCancel.Click += (sender, e) => { Close(); };
4286
}
4387
}

‎AzTagger/InputDialog.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>

0 commit comments

Comments
 (0)