Skip to content

Commit

Permalink
Merge pull request #17 from ZeaCold/feature/rework-net8
Browse files Browse the repository at this point in the history 
Remade the app with .Net8
  • Loading branch information
@zcBruAll
zcBruAll authored Sep 13, 2024
2 parents bd04177 + d9d079a commit 5585a6b
Show file tree
Hide file tree
Showing 13 changed files with 519 additions and 838 deletions.
10 changes: 10 additions & 0 deletions AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
369 changes: 190 additions & 179 deletions MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,187 +5,198 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:ZC.TimeCalculator"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="Calculateur d'heures"
Width="425"
Height="176"
Icon="/Resources/Images/clock.png"
ResizeMode="CanMinimize"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="Time Calculator"
Width="440"
Height="210"
Icon="Resources/Images/clock.png"
ResizeMode="NoResize"
mc:Ignorable="d">
<Grid x:Name="mainGrid">
<Label
x:Name="lblRequired"
Width="60"
Margin="9,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Requis" />
<TextBox
x:Name="txtTimeRequired"
Width="105"
Height="26"
Margin="74,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="08:24"
TextChanged="FieldTimeRequired_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblStart"
Width="60"
Margin="9,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Arrivée" />
<TextBox
x:Name="txtTimeStart"
Width="105"
Height="26"
Margin="74,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblStartBreak"
Width="80"
Margin="210,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Début Pause" />
<TextBox
x:Name="txtTimeStartPause"
Width="105"
Height="26"
Margin="295,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEndBreak"
Width="60"
Margin="9,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Fin Pause" />
<TextBox
x:Name="txtTimeEndPause"
Width="105"
Height="26"
Margin="74,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEnd"
Width="80"
Margin="210,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Fin"
MouseDoubleClick="FieldEnd_MouseDoubleClick"
ToolTip="Double-click to toggle edit" />
<TextBox
x:Name="txtTimeEnd"
Width="105"
Height="26"
Margin="295,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
IsReadOnly="True"
MouseDoubleClick="FieldEnd_MouseDoubleClick"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsEnd_TextChanged"
TextWrapping="Wrap"
ToolTip="Double-click to toggle edit" />
<Label
x:Name="lblHSupp"
Width="60"
Margin="9,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="H. supp."
ToolTip="Éditer l'heure de fin pour calculer les heures supplémentaires" />
<TextBox
x:Name="txtTimeSupp"
Width="105"
Height="26"
Margin="74,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsSupp_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEndSupp"
Width="80"
Margin="210,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Fin (supp.)" />
<TextBox
x:Name="txtTimeEndSupp"
Width="105"
Height="26"
Margin="295,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
IsReadOnly="True"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextWrapping="Wrap" />

<TabControl>
<TabItem Header="Job time">
<Grid x:Name="gridTimeWork" Margin="0,0,0,0">
<Label
x:Name="lblRequired"
Width="60"
Margin="10,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Required" />
<TextBox
x:Name="txtTimeRequired"
Width="105"
Height="26"
Margin="75,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="08:24"
TextChanged="FieldTimeRequired_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblStart"
Width="60"
Margin="10,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Start" />
<TextBox
x:Name="txtTimeStart"
Width="105"
Height="26"
Margin="75,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblStartBreak"
Width="80"
Margin="211,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Break" />
<TextBox
x:Name="txtTimeStartPause"
Width="105"
Height="26"
Margin="296,41,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEndBreak"
Width="60"
Margin="10,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="Restart" />
<TextBox
x:Name="txtTimeEndPause"
Width="105"
Height="26"
Margin="75,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsWorkTime_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEnd"
Width="80"
Margin="211,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="End"
MouseDoubleClick="FieldEnd_MouseDoubleClick"
ToolTip="Double-click to toggle edit" />
<TextBox
x:Name="txtTimeEnd"
Width="105"
Height="26"
Margin="296,72,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
IsReadOnly="True"
MouseDoubleClick="FieldEnd_MouseDoubleClick"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsEnd_TextChanged"
TextWrapping="Wrap"
ToolTip="Double-click to toggle edit" />
<Label
x:Name="lblHSupp"
Width="60"
Margin="10,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="H. Supp."
ToolTip="Edit the end time to calculate the Supp. time" />
<TextBox
x:Name="txtTimeSupp"
Width="105"
Height="26"
Margin="75,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextChanged="FieldsSupp_TextChanged"
TextWrapping="Wrap" />
<Label
x:Name="lblEndSupp"
Width="80"
Margin="211,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Right"
VerticalContentAlignment="Center"
Content="End (supp.)" />
<TextBox
x:Name="txtTimeEndSupp"
Width="105"
Height="26"
Margin="296,103,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
FontFamily="Arial"
FontSize="16"
IsReadOnly="True"
PreviewKeyDown="Field_PreviewKeyDown"
Text="__:__"
TextWrapping="Wrap" />
</Grid>
</TabItem>
<TabItem Header="Converter" IsEnabled="False">
<Grid/>
</TabItem>
</TabControl>

</Grid>
</Window>
Loading

0 comments on commit 5585a6b

Please sign in to comment.