Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Adds a DatePicker to EditView.xaml for the End Date. #4804

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Adds a DatePicker to EditView.xaml for the End Date. #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
934e2ab
Updating TogglDesktop.csproj to support multiple versions of the Wind…
daiplusplus Jan 23, 2021
5e2e751
Adding `endDatePicker` to EditView.xaml. Updating <Grid> layout.
daiplusplus Jan 23, 2021
7a9e4bc
Integrating the End-Date-Picker with EditView.xaml.cs.
daiplusplus Jan 23, 2021
cec74cf
Tidying up.
daiplusplus Jan 23, 2021
e57d83b
More tabs-to-spaces.
daiplusplus Jan 23, 2021
83f002d
Supporting variable-width durationTextBox.
daiplusplus Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/ui/windows/TogglDesktop/TogglDesktop/TogglDesktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,17 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Windows">
<HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
</Reference>
<Reference Include="Windows.Foundation.FoundationContract">
<HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Windows.Foundation.UniversalApiContract">
<HintPath>C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
<Private>False</Private>
<Reference Include="Windows">
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd')">C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd</HintPath>
</Reference>
<Reference Include="Windows.Foundation.FoundationContract">
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.FoundationContract\4.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
</Reference>
<Reference Include="Windows.Foundation.UniversalApiContract">
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.16299.0\Windows.Foundation.UniversalApiContract\5.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
<HintPath Condition="Exists('C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd')">C:\Program Files (x86)\Windows Kits\10\References\10.0.19041.0\Windows.Foundation.UniversalApiContract\10.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
84 changes: 60 additions & 24 deletions src/ui/windows/TogglDesktop/TogglDesktop/ui/views/EditView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,41 +198,77 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="21*" />
<ColumnDefinition Width="17*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="17*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Style="{DynamicResource Toggl.BodyText}" Margin="0 0 0 8" Text="Duration" />
<toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="1" Grid.Column="0"
Margin="0 0 12 0"
Style="{StaticResource {x:Type TextBox}}"
LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>

<!-- Row 0: Start -->
<TextBlock Style="{DynamicResource Toggl.BodyText}"
Grid.Row="0" Grid.Column="0"
VerticalAlignment="Center"
Margin="0 0 10 8"
Text="Start" />

<DatePicker Name="startDatePicker" x:FieldModifier="private"
Style="{StaticResource EditViewDatePickerStyle}"
Grid.Row="0" Grid.Column="1"
Margin="0 0 0 8"
Height="32"
LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
<i:Interaction.Behaviors>
<behaviors:DatePickerKeyboardHandlingBehavior />
</i:Interaction.Behaviors>
</DatePicker>

<toggl:ExtendedTextBox x:Name="startTimeTextBox" x:FieldModifier="private"
Grid.Row="1" Grid.Column="1"
Grid.Row="0" Grid.Column="2"
Margin="8 0 0 8"
Height="32"
Style="{StaticResource {x:Type TextBox}}"
LostKeyboardFocus="startTimeTextBox_OnLostKeyboardFocus"
KeyDown="startTimeTextBox_OnKeyDown">12:45</toggl:ExtendedTextBox>
<ContentControl Focusable="False"
Margin="6 0"
Grid.Row="1" Grid.Column="2"
Content="{StaticResource Toggl.ArrowIcon}" />
<toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
Grid.Row="1" Grid.Column="3"
Style="{StaticResource {x:Type TextBox}}"
LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>
<DatePicker Name="startDatePicker" x:FieldModifier="private" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4"

<!-- Row 1: End -->
<TextBlock Style="{DynamicResource Toggl.BodyText}"
Grid.Row="1" Grid.Column="0"
VerticalAlignment="Center"
Margin="0 0 10 8"
Text="End"/>

<DatePicker Name="endDatePicker" x:FieldModifier="private"
Style="{StaticResource EditViewDatePickerStyle}"
Margin="0 8 0 0"
Grid.Row="1" Grid.Column="1"
Margin="0 0 0 8"
Height="32"
SelectedDate="05.01.2015"
LostKeyboardFocus="startDatePicker_LostKeyboardFocus">
LostKeyboardFocus="endDatePicker_LostKeyboardFocus">
<i:Interaction.Behaviors>
<behaviors:DatePickerKeyboardHandlingBehavior />
</i:Interaction.Behaviors>
</DatePicker>

<toggl:ExtendedTextBox x:Name="endTimeTextBox" x:FieldModifier="private"
Grid.Row="1" Grid.Column="2"
Margin="8 0 0 8"
Height="32"
Style="{StaticResource {x:Type TextBox}}"
LostKeyboardFocus="endTimeTextBox_OnLostKeyboardFocus"
KeyDown="endTimeTextBox_OnKeyDown">12:55</toggl:ExtendedTextBox>

<!-- Row 2: Duration -->
<TextBlock Style="{DynamicResource Toggl.BodyText}"
Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
VerticalAlignment="Center"
Margin="0 0 10 10"
Text="Duration" />

<toggl:ExtendedTextBox x:Name="durationTextBox" x:FieldModifier="private" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"
Margin="8 0 0 8"
Height="32"
Style="{StaticResource {x:Type TextBox}}"
HorizontalAlignment="Right"
LostKeyboardFocus="durationTextBox_OnLostKeyboardFocus"
KeyDown="durationTextBox_OnKeyDown">10:12 min</toggl:ExtendedTextBox>
</Grid>

<TextBlock Margin="0 14 0 0" LineHeight="20" FontSize="{DynamicResource NormalFontSize}">
Expand Down
Loading