Skip to content

Commit 8c6ac55

Browse files
CyanCodingCyanCoding
authored
Merge pull request #56 from CyanCoding/cyancoding-settings-branch
Cyancoding settings branch
2 parents b15d9f2 + ace7ee6 commit 8c6ac55

5 files changed

Lines changed: 360 additions & 19 deletions

File tree

‎app/Project Tracker/Project Tracker/MainWindow.xaml‎

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,16 @@
6868

6969
<Grid Background="White">
7070
<Rectangle x:Name="blackRectangle" Fill="#FF212121" HorizontalAlignment="Left" Height="776" VerticalAlignment="Top" Width="350" Margin="-5,-5,-5,-5" />
71-
<Canvas VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,43,0,0" Height="45" Width="45">
72-
<Image Source="{StaticResource checked_checkedboxDrawingImage}" Height="45" Width="45" />
73-
</Canvas>
74-
<Label Content="Project Tracker" HorizontalAlignment="Left" Margin="60,30,0,0" VerticalAlignment="Top" Foreground="White" FontSize="26" />
75-
<Label x:Name="versionLabel" Content="" HorizontalAlignment="Left" Margin="60,69,0,0" VerticalAlignment="Top" Foreground="#FFB8B8B8" FontSize="14" />
71+
<Border PreviewMouseDown="OverallSettingsBorderMouseDown" Cursor="Hand">
72+
<Grid>
73+
<Canvas VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,43,0,0" Height="45" Width="45">
74+
<Image Source="{StaticResource checked_checkedboxDrawingImage}" Height="45" Width="45" />
75+
</Canvas>
76+
<Label Content="Project Tracker" HorizontalAlignment="Left" Margin="60,30,0,0" VerticalAlignment="Top" Foreground="White" FontSize="26" />
77+
<Label x:Name="versionLabel" Content="" HorizontalAlignment="Left" Margin="60,69,0,0" VerticalAlignment="Top" Foreground="#FFB8B8B8" FontSize="14" />
78+
</Grid>
79+
</Border>
80+
7681
<!-- We need this to be 10 from each side in the code -->
7782
<Border HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="0" CornerRadius="4,4,4,4" BorderBrush="Black" Background="#FF9B9B9B" Width="325" Height="4" Margin="10,98,0,0" />
7883

@@ -294,6 +299,20 @@
294299
</Grid>
295300
</ScrollViewer>
296301
</Grid>
302+
303+
<!-- The settings menu -->
304+
<Grid x:Name="settingsGrid" Margin="350,100,0,0" Visibility="Hidden">
305+
<Button x:Name="updateButton1" Content="Check for an update" HorizontalAlignment="Left" Margin="20,25,0,0" VerticalAlignment="Top" Width="210" Height="48" Cursor="Hand" FontSize="20" PreviewMouseDown="UpdateButtonMouseDown"/>
306+
<Label x:Name="currentVersionLabel" Content="Installed version: " HorizontalAlignment="Left" Margin="20,78,0,0" VerticalAlignment="Top" FontSize="16"/>
307+
<Label x:Name="latestVersionLabel" Content="Latest version: unavailable" HorizontalAlignment="Left" Margin="20,109,0,0" VerticalAlignment="Top" FontSize="16"/>
308+
<Label Content="Next version details" HorizontalAlignment="Left" Margin="20,300,0,0" VerticalAlignment="Top" FontSize="36"/>
309+
<Label x:Name="nextVersionLabel" Content="Downloading next version information..." HorizontalAlignment="Left" Margin="20,358,0,0" VerticalAlignment="Top" FontSize="24"/>
310+
<Label x:Name="nextVersionReleaseLabel" Visibility="Hidden" Content="Release date: " HorizontalAlignment="Left" Margin="20,400,0,0" VerticalAlignment="Top" FontSize="24"/>
311+
<Label x:Name="nextVersionFeaturesLabel" Visibility="Hidden" Content="Features:" HorizontalAlignment="Left" Margin="20,460,0,0" VerticalAlignment="Top" FontSize="30"/>
312+
<Label x:Name="nextVersionUpdateOneLabel" Visibility="Hidden" Content="1. " HorizontalAlignment="Left" Margin="20,510,0,0" VerticalAlignment="Top" FontSize="24"/>
313+
<Label x:Name="nextVersionUpdateTwoLabel" Visibility="Hidden" Content="2. " HorizontalAlignment="Left" Margin="20,552,0,0" VerticalAlignment="Top" FontSize="24"/>
314+
<Label x:Name="nextVersionUpdateThreeLabel" Visibility="Hidden" Content="3. " HorizontalAlignment="Left" Margin="20,594,0,0" VerticalAlignment="Top" FontSize="24"/>
315+
</Grid>
297316

298317
<!-- Incomplete vs complete grid -->
299318
<Grid x:Name="completeGrid" Margin="391,136,0,0" Visibility="Hidden">
@@ -514,6 +533,35 @@
514533
</Grid>
515534
</Border>
516535

536+
<!-- The border for project tracker settings -->
537+
<Border x:Name="overallSettingsBorder" CornerRadius="10" HorizontalAlignment="Left" Height="70" VerticalAlignment="Top" Width="180" Background="White" Visibility="Hidden" LostFocus="overallSettingsBorder_LostFocus" Margin="20,105,10,0" Cursor="Hand">
538+
<Border.Effect>
539+
<DropShadowEffect ShadowDepth="1" />
540+
</Border.Effect>
541+
<Grid>
542+
<Grid.RowDefinitions>
543+
<RowDefinition Height="70" />
544+
</Grid.RowDefinitions>
545+
<Grid.ColumnDefinitions>
546+
<ColumnDefinition Width="50" />
547+
<ColumnDefinition Width="130" />
548+
</Grid.ColumnDefinitions>
549+
550+
<!-- First item -->
551+
<Border PreviewMouseDown="SettingsButtonMouseDown" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Cursor="Hand">
552+
<Grid>
553+
<Grid.ColumnDefinitions>
554+
<ColumnDefinition Width="50" />
555+
<ColumnDefinition Width="180" />
556+
</Grid.ColumnDefinitions>
557+
<Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Height="40" Width="40" Cursor="Hand" Margin="10,16,1,14" Grid.Column="0">
558+
<Image Source="{StaticResource settingsDrawingImage}" Height="40" Width="40" Grid.Column="0" />
559+
</Canvas>
560+
<Label Content="Settings" Grid.Column="1" HorizontalAlignment="Left" Margin="10,0,-9,0" VerticalAlignment="Center" FontSize="24" Width="180" Height="70" VerticalContentAlignment="Center" />
561+
</Grid>
562+
</Border>
563+
</Grid>
564+
</Border>
517565
<!-- Update notifier-->
518566
<Grid x:Name="updateGrid" HorizontalAlignment="Left" Height="0" VerticalAlignment="Bottom" Margin="-5,0,0,-5" Width="350" Background="#FFE67C11" Visibility="Hidden">
519567
<TextBlock Text="An update to the Project Tracker is available!" TextWrapping="Wrap" HorizontalAlignment="Left" Foreground="White" FontSize="18" Margin="10,10,0,58" VerticalAlignment="Center" Width="234" Height="63" />

0 commit comments

Comments
 (0)