Skip to content

Commit

Permalink
1. Добавив установник
Browse files Browse the repository at this point in the history 
2. Добавив всі діалогі
3. Доповнив локалізацію

Тепер проект закінчений
  • Loading branch information
@kimpors
kimpors committed Jun 7, 2022
1 parent 033ca16 commit 4527982
Show file tree
Hide file tree
Showing 46 changed files with 4,201 additions and 288 deletions.
14 changes: 14 additions & 0 deletions Blind typing trainer.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,30 @@ VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blind typing trainer", "Blind typing trainer\Blind typing trainer.csproj", "{477D45C8-634D-47DE-B91B-592C471F3B4A}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{27CB1021-2F67-45C6-9F78-BEC6E1595907}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Debug|x64.ActiveCfg = Debug|x64
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Debug|x64.Build.0 = Debug|x64
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Release|Any CPU.Build.0 = Release|Any CPU
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Release|x64.ActiveCfg = Release|x64
{477D45C8-634D-47DE-B91B-592C471F3B4A}.Release|x64.Build.0 = Release|x64
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Debug|Any CPU.ActiveCfg = Release
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Debug|Any CPU.Build.0 = Release
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Debug|x64.ActiveCfg = Release
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Release|Any CPU.ActiveCfg = Release
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Release|x64.ActiveCfg = Release
{27CB1021-2F67-45C6-9F78-BEC6E1595907}.Release|x64.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
105 changes: 90 additions & 15 deletions Blind typing trainer/Blind typing trainer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -50,6 +50,26 @@
<PropertyGroup>
<ApplicationIcon>Images\ProjectIcon.ICO</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLipsum.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=593e1df460e1bda0, processorArchitecture=MSIL">
<HintPath>..\packages\NLipsum.1.1.0\lib\net20\NLipsum.Core.dll</HintPath>
Expand All @@ -76,11 +96,29 @@
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="MyControls\InfoDialog.cs">
<Compile Include="MyControls\MyInfoDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MyControls\MyInfoDialog.Designer.cs">
<DependentUpon>MyInfoDialog.cs</DependentUpon>
</Compile>
<Compile Include="MyControls\MyShortTextInfoDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MyControls\MyShortTextInfoDialog.Designer.cs">
<DependentUpon>MyShortTextInfoDialog.cs</DependentUpon>
</Compile>
<Compile Include="MyControls\MyColorDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MyControls\InfoDialog.Designer.cs">
<DependentUpon>InfoDialog.cs</DependentUpon>
<Compile Include="MyControls\MyColorDialog.Designer.cs">
<DependentUpon>MyColorDialog.cs</DependentUpon>
</Compile>
<Compile Include="MyControls\MyFontDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MyControls\MyFontDialog.Designer.cs">
<DependentUpon>MyFontDialog.cs</DependentUpon>
</Compile>
<Compile Include="MyControls\SaveDialog.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -122,17 +160,56 @@
<EmbeddedResource Include="Form1.uk.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\InfoDialog.en.resx">
<DependentUpon>InfoDialog.cs</DependentUpon>
<EmbeddedResource Include="MyControls\MyInfoDialog.en.resx">
<DependentUpon>MyInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyInfoDialog.resx">
<DependentUpon>MyInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyInfoDialog.ru.resx">
<DependentUpon>MyInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyInfoDialog.uk.resx">
<DependentUpon>MyInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyShortTextInfoDialog.en.resx">
<DependentUpon>MyShortTextInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyShortTextInfoDialog.resx">
<DependentUpon>MyShortTextInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyColorDialog.en.resx">
<DependentUpon>MyColorDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyColorDialog.resx">
<DependentUpon>MyColorDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\InfoDialog.resx">
<DependentUpon>InfoDialog.cs</DependentUpon>
<EmbeddedResource Include="MyControls\MyColorDialog.ru.resx">
<DependentUpon>MyColorDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\InfoDialog.ru.resx">
<DependentUpon>InfoDialog.cs</DependentUpon>
<EmbeddedResource Include="MyControls\MyColorDialog.uk.resx">
<DependentUpon>MyColorDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\InfoDialog.uk.resx">
<DependentUpon>InfoDialog.cs</DependentUpon>
<EmbeddedResource Include="MyControls\MyFontDialog.en.resx">
<DependentUpon>MyFontDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyFontDialog.resx">
<DependentUpon>MyFontDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyFontDialog.ru.resx">
<DependentUpon>MyFontDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyFontDialog.uk.resx">
<DependentUpon>MyFontDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyShortTextInfoDialog.ru.resx">
<DependentUpon>MyShortTextInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\MyShortTextInfoDialog.uk.resx">
<DependentUpon>MyShortTextInfoDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\SaveDialog.am.resx">
<DependentUpon>SaveDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MyControls\SaveDialog.en.resx">
<DependentUpon>SaveDialog.cs</DependentUpon>
Expand Down Expand Up @@ -197,8 +274,6 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
45 changes: 23 additions & 22 deletions Blind typing trainer/Form1.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 11 additions & 9 deletions Blind typing trainer/Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Form1()
// Stats
aveSpeed.Text = currLanguage.AverageSpeed + " " + user.allRuns.Average().ToString(".00");
allTime.Text = currLanguage.AllTimeOfTraining + " " + user.trainingTime.ToString();
record.Text = "Record: " + user.allRuns.Max().ToString(".00");
record.Text = currLanguage.Record + " " + user.allRuns.Max().ToString(".00");

chart1.Series[0].Points.Clear();
foreach (var item in user.allRuns)
Expand Down Expand Up @@ -114,7 +114,7 @@ void Form1_KeyPress(object sender, KeyPressEventArgs e)

if (symbolCount == mistakePos) mistakePos = NOTHING;

SetTheme();
SetTheme(false);
PaintLetters();
}
return;
Expand Down Expand Up @@ -156,9 +156,9 @@ void Form1_FormClosed(object sender, FormClosedEventArgs e)
}


void SetTheme()
void SetTheme(bool isNeedChangeFont = true)
{
currTheme.SetTheme(this);
currTheme.SetTheme(this, isNeedChangeFont);
currTheme.SetChartTheme(chart1);
currTheme.SetMenuTheme(menuStrip1);

Expand All @@ -176,7 +176,6 @@ void PaintLetters()
TypingField.SelectionColor = Color.LimeGreen;
}


if (mistakePos != NOTHING)
{
TypingField.Select(mistakePos, mistakePos != NOTHING ? symbolCount - mistakePos : symbolCount);
Expand Down Expand Up @@ -220,7 +219,7 @@ void panelShow_Click(object sender, EventArgs e)
{
aveSpeed.Text = currLanguage.AverageSpeed + " " + user.allRuns.Average().ToString(".00");
allTime.Text = currLanguage.AllTimeOfTraining + " " + user.trainingTime;
record.Text = "Record: " + user.allRuns.Max().ToString(".00");
record.Text = currLanguage.Record + " " + user.allRuns.Max().ToString(".00");

chart1.Series[0].Points.Clear();
foreach (var item in user.allRuns)
Expand Down Expand Up @@ -327,7 +326,10 @@ void openToolStripMenuItem_Click(object sender, EventArgs e)

if (allText.Length < 1000)
{
MessageBox.Show(currLanguage.ShortTextInfo, currLanguage.Info, MessageBoxButtons.OK, MessageBoxIcon.Information);
MyControls.MyShortTextInfoDialog a = new MyControls.MyShortTextInfoDialog(currTheme);
a.ShowDialog();
//MessageBox.Show(currLanguage.ShortTextInfo, currLanguage.Info, MessageBoxButtons.OK, MessageBoxIcon.Information);

allText = currLanguage.Standart;
}

Expand All @@ -350,7 +352,7 @@ void onlineGeneratorToolStripMenuItem_Click(object sender, EventArgs e)

void infoToolStripMenuItem_Click(object sender, EventArgs e)
{
InfoDialog id = new InfoDialog(currTheme);
MyInfoDialog id = new MyInfoDialog(currTheme);
id.ShowDialog();
}
void themeToolStripMenuItem_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -380,7 +382,7 @@ void timer_Tick(object sender, EventArgs e)
raceResult = (symbolCount + mistakeCount) / timer.TotalMinutes / 5;
Speed.Text = $"{currLanguage.Speed} " + ((int)raceResult).ToString() + "WP";
}
else
else
{ StartTimer.Text = StartTimer.Text != "1" ? (int.Parse(StartTimer.Text) - 1).ToString() : StartTyping; }
}
}
Expand Down
Loading

0 comments on commit 4527982

Please sign in to comment.