Skip to content

Commit 821ea36

Browse files
author
Adriano
committed
v0.0.2
1 parent c9a89a1 commit 821ea36

17 files changed

Lines changed: 1595 additions & 290 deletions

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Buildnummer
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("0.0.1.0")]
33-
[assembly: AssemblyFileVersion("0.0.1.0")]
32+
[assembly: AssemblyVersion("0.0.2.0")]
33+
[assembly: AssemblyFileVersion("0.0.2.0")]

Tool.cs

Lines changed: 0 additions & 119 deletions
This file was deleted.

esp_tools_gui.csproj

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
<StartupObject>esp_tools_gui.App</StartupObject>
5252
</PropertyGroup>
5353
<PropertyGroup>
54-
<ApplicationIcon>ESP32.ico</ApplicationIcon>
54+
<ApplicationIcon>src\ESP32.ico</ApplicationIcon>
5555
</PropertyGroup>
5656
<ItemGroup>
57-
<None Include="App.config" />
57+
<None Include="src\App.config" />
5858
<None Include="Properties\Settings.settings">
5959
<Generator>SettingsSingleFileGenerator</Generator>
6060
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -70,11 +70,17 @@
7070
<Reference Include="System.Xml" />
7171
</ItemGroup>
7272
<ItemGroup>
73-
<Compile Include="App.cs" />
74-
<Compile Include="MainPage.cs">
73+
<Compile Include="src\App.cs" />
74+
<Compile Include="src\Connecting.cs">
7575
<SubType>Form</SubType>
7676
</Compile>
77-
<Compile Include="MainPage.Designer.cs">
77+
<Compile Include="src\Connecting.Designer.cs">
78+
<DependentUpon>Connecting.cs</DependentUpon>
79+
</Compile>
80+
<Compile Include="src\MainPage.cs">
81+
<SubType>Form</SubType>
82+
</Compile>
83+
<Compile Include="src\MainPage.Designer.cs">
7884
<DependentUpon>MainPage.cs</DependentUpon>
7985
</Compile>
8086
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -88,19 +94,23 @@
8894
<DesignTimeSharedInput>True</DesignTimeSharedInput>
8995
<DependentUpon>Settings.settings</DependentUpon>
9096
</Compile>
91-
<Compile Include="Tool.cs" />
92-
<Compile Include="ToolEfuse.cs" />
93-
<Compile Include="ToolPartition.cs" />
94-
<Compile Include="ToolSecure.cs" />
95-
<Compile Include="ToolTool.cs" />
97+
<Compile Include="src\Tool.cs" />
98+
<Compile Include="src\ToolEfuse.cs" />
99+
<Compile Include="src\ToolPartition.cs" />
100+
<Compile Include="src\ToolSecure.cs" />
101+
<Compile Include="src\ToolTool.cs" />
96102
</ItemGroup>
97103
<ItemGroup>
98-
<EmbeddedResource Include="MainPage.resx">
104+
<EmbeddedResource Include="src\Connecting.resx">
105+
<DependentUpon>Connecting.cs</DependentUpon>
106+
</EmbeddedResource>
107+
<EmbeddedResource Include="src\MainPage.resx">
99108
<DependentUpon>MainPage.cs</DependentUpon>
100109
</EmbeddedResource>
101110
<EmbeddedResource Include="Properties\Resources.resx">
102111
<Generator>PublicResXFileCodeGenerator</Generator>
103112
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
113+
<SubType>Designer</SubType>
104114
</EmbeddedResource>
105115
</ItemGroup>
106116
<ItemGroup>
@@ -130,7 +140,7 @@
130140
</None>
131141
</ItemGroup>
132142
<ItemGroup>
133-
<Content Include="ESP32.ico" />
143+
<Content Include="src\ESP32.ico" />
134144
<Content Include="images\esp32.jpg" />
135145
</ItemGroup>
136146
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
File renamed without changes.

App.cs renamed to src/App.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ class App
1010
{
1111
public static MainPage form;
1212

13-
static void Main(string[] args) {
13+
static void Main() {
14+
1415
form = new MainPage();
1516
form.ShowDialog();
1617
}

src/Connecting.Designer.cs

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

src/Connecting.cs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace esp_tools_gui
12+
{
13+
public partial class Connecting : Form
14+
{
15+
private static bool Stop = false;
16+
public Connecting(string tool, string text)
17+
{
18+
InitializeComponent();
19+
20+
Opacity = 0.0;
21+
TitleLabel.Text = tool;
22+
ConnectionLabel.Text = text;
23+
progressBar1.Value = 0;
24+
timer1.Enabled = true;
25+
Stop = false;
26+
}
27+
28+
private void timer1_Tick(object sender, EventArgs e)
29+
{
30+
if (Opacity < 1.0) Opacity += 0.05;
31+
if (progressBar1.Value < progressBar1.Maximum) progressBar1.Value++;
32+
if (Stop)
33+
{
34+
timer1.Enabled = false;
35+
this.Close();
36+
}
37+
}
38+
39+
public static void Terminate()
40+
{
41+
Stop = true;
42+
}
43+
}
44+
}

0 commit comments

Comments
 (0)