Skip to content

Commit 9ad7997

Browse files
sirdoomboxsirdoombox
committed
Update Credits & CreditsView, Testing release to see if auto-update functionality works.
1 parent 5508f33 commit 9ad7997

File tree

2 files changed

+83
-65
lines changed

2 files changed

+83
-65
lines changed

‎PostScriptumMortarCalculator/Assets/Data/CreditsData.json

+12
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
"ContributionDescription": "Extracted map images from the game files for use in the tool.",
2121
"URL": "https://www.gildor.org/en/projects/umodel"
2222
},
23+
{
24+
"Name": "AppVeyor",
25+
"ContributionType": "Build & Deployment",
26+
"ContributionDescription": "Builds, patches and deploys releases to GitHub.",
27+
"URL": "https://www.appveyor.com/"
28+
},
2329
{
2430
"Name": "MahApps.Metro",
2531
"ContributionType": "UI & Controls",
@@ -36,6 +42,12 @@
3642
"ContributionType": "Assembly Weaver",
3743
"ContributionDescription": "Embeds resources and external libraries into the assembly, implements PropertyChanged at compile time.",
3844
"URL": "https://github.com/Fody/Fody"
45+
},
46+
{
47+
"Name": "OctoKit.NET",
48+
"ContributionType": "GitHub API Wrapper",
49+
"ContributionDescription": "Provides the ability to check for new releases.",
50+
"URL": "https://github.com/octokit/octokit.net"
3951
}
4052
]
4153
}

‎PostScriptumMortarCalculator/Views/CreditsView.xaml

+71-65
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,74 @@
99
x:Name="RootControl"
1010
mc:Ignorable="d"
1111
d:DataContext="{d:DesignInstance viewModels:CreditsViewModel}">
12-
<StackPanel>
13-
<StackPanel.Resources>
14-
<Thickness x:Key="ControlMargin">0 10 0 0</Thickness>
15-
<Style TargetType="Label">
16-
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}"/>
17-
<Setter Property="FontWeight" Value="Black"/>
18-
<Setter Property="HorizontalAlignment" Value="Center"/>
19-
<Setter Property="HorizontalContentAlignment" Value="Center"/>
20-
<Setter Property="FontSize" Value="18"/>
21-
</Style>
22-
<Style TargetType="DockPanel" x:Key="DockPanelStyle">
23-
<Setter Property="HorizontalAlignment" Value="Stretch"/>
24-
<Setter Property="Margin" Value="{StaticResource ControlMargin}"/>
25-
<Style.Resources>
26-
<Style TargetType="Label">
27-
<Setter Property="DockPanel.Dock" Value="Left"/>
28-
<Setter Property="HorizontalAlignment" Value="Left"/>
29-
<Setter Property="VerticalAlignment" Value="Top"/>
30-
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}"/>
31-
<Setter Property="FontWeight" Value="Bold"/>
32-
</Style>
33-
<Style TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}">
34-
<Setter Property="DockPanel.Dock" Value="Right"/>
35-
<Setter Property="Margin" Value="10 0 0 0"/>
36-
<Setter Property="HorizontalAlignment" Value="Left"/>
37-
<Setter Property="VerticalAlignment" Value="Center"/>
38-
</Style>
39-
</Style.Resources>
40-
</Style>
41-
</StackPanel.Resources>
42-
<Label Content="Contributors"/>
43-
<ItemsControl ItemsSource="{Binding Contributors}">
44-
<ItemsControl.ItemTemplate>
45-
<DataTemplate>
46-
<DockPanel Style="{StaticResource DockPanelStyle}">
47-
<Label Content="{Binding ContributionType}"
48-
ToolTip="{Binding ContributionDescription}"/>
49-
<Button Content="{Binding Name}"
50-
ToolTip="{Binding URL}"
51-
Command="{Binding ElementName=RootControl, Path=DataContext.OpenUrlCommand}"
52-
CommandParameter="{Binding URL}"/>
53-
</DockPanel>
54-
</DataTemplate>
55-
</ItemsControl.ItemTemplate>
56-
</ItemsControl>
57-
<Separator Background="{DynamicResource MahApps.Brushes.Accent}"
58-
Margin="{StaticResource ControlMargin}"/>
59-
<Label Content="External Tools &amp; Libraries"
60-
Margin="{StaticResource ControlMargin}"/>
61-
<ItemsControl ItemsSource="{Binding ExternalTools}">
62-
<ItemsControl.ItemTemplate>
63-
<DataTemplate>
64-
<DockPanel Style="{StaticResource DockPanelStyle}">
65-
<Label Content="{Binding ContributionType}"
66-
ToolTip="{Binding ContributionDescription}"/>
67-
<Button Content="{Binding Name}"
68-
Command="{Binding ElementName=RootControl, Path=DataContext.OpenUrlCommand}"
69-
ToolTip="{Binding URL}"
70-
CommandParameter="{Binding URL}"/>
71-
</DockPanel>
72-
</DataTemplate>
73-
</ItemsControl.ItemTemplate>
74-
</ItemsControl>
75-
</StackPanel>
76-
</UserControl>
12+
<ScrollViewer HorizontalAlignment="Stretch"
13+
VerticalAlignment="Stretch"
14+
VerticalScrollBarVisibility="Auto"
15+
HorizontalScrollBarVisibility="Disabled"
16+
CanContentScroll="True">
17+
<StackPanel>
18+
<StackPanel.Resources>
19+
<Thickness x:Key="ControlMargin">0 10 0 0</Thickness>
20+
<Style TargetType="Label">
21+
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
22+
<Setter Property="FontWeight" Value="Black" />
23+
<Setter Property="HorizontalAlignment" Value="Center" />
24+
<Setter Property="HorizontalContentAlignment" Value="Center" />
25+
<Setter Property="FontSize" Value="18" />
26+
</Style>
27+
<Style TargetType="DockPanel" x:Key="DockPanelStyle">
28+
<Setter Property="HorizontalAlignment" Value="Stretch" />
29+
<Setter Property="Margin" Value="{StaticResource ControlMargin}" />
30+
<Style.Resources>
31+
<Style TargetType="Label">
32+
<Setter Property="DockPanel.Dock" Value="Left" />
33+
<Setter Property="HorizontalAlignment" Value="Left" />
34+
<Setter Property="VerticalAlignment" Value="Top" />
35+
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Accent}" />
36+
<Setter Property="FontWeight" Value="Bold" />
37+
</Style>
38+
<Style TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Chromeless}">
39+
<Setter Property="DockPanel.Dock" Value="Right" />
40+
<Setter Property="Margin" Value="10 0 0 0" />
41+
<Setter Property="HorizontalAlignment" Value="Left" />
42+
<Setter Property="VerticalAlignment" Value="Center" />
43+
</Style>
44+
</Style.Resources>
45+
</Style>
46+
</StackPanel.Resources>
47+
<Label Content="Contributors" />
48+
<ItemsControl ItemsSource="{Binding Contributors}">
49+
<ItemsControl.ItemTemplate>
50+
<DataTemplate>
51+
<DockPanel Style="{StaticResource DockPanelStyle}">
52+
<Label Content="{Binding ContributionType}"
53+
ToolTip="{Binding ContributionDescription}" />
54+
<Button Content="{Binding Name}"
55+
ToolTip="{Binding URL}"
56+
Command="{Binding ElementName=RootControl, Path=DataContext.OpenUrlCommand}"
57+
CommandParameter="{Binding URL}" />
58+
</DockPanel>
59+
</DataTemplate>
60+
</ItemsControl.ItemTemplate>
61+
</ItemsControl>
62+
<Separator Background="{DynamicResource MahApps.Brushes.Accent}"
63+
Margin="{StaticResource ControlMargin}" />
64+
<Label Content="External Tools &amp; Libraries"
65+
Margin="{StaticResource ControlMargin}" />
66+
<ItemsControl ItemsSource="{Binding ExternalTools}">
67+
<ItemsControl.ItemTemplate>
68+
<DataTemplate>
69+
<DockPanel Style="{StaticResource DockPanelStyle}">
70+
<Label Content="{Binding ContributionType}"
71+
ToolTip="{Binding ContributionDescription}" />
72+
<Button Content="{Binding Name}"
73+
Command="{Binding ElementName=RootControl, Path=DataContext.OpenUrlCommand}"
74+
ToolTip="{Binding URL}"
75+
CommandParameter="{Binding URL}" />
76+
</DockPanel>
77+
</DataTemplate>
78+
</ItemsControl.ItemTemplate>
79+
</ItemsControl>
80+
</StackPanel>
81+
</ScrollViewer>
82+
</UserControl>

0 commit comments

Comments
 (0)