Skip to content
This repository was archived by the owner on Dec 14, 2022. It is now read-only.

Commit 31985b2

Browse files
dreanordreanor
committed
small project changes
1 parent b818b8f commit 31985b2

File tree

4 files changed

+49
-61
lines changed

4 files changed

+49
-61
lines changed

‎src/app/ShellView.xaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
IsEnabled="{Binding Path=IsEnabled, UpdateSourceTrigger=PropertyChanged}"
88
WindowStartupLocation="CenterScreen"
99
EnableDWMDropShadow="True"
10-
Width="1200"
10+
Width="1280"
1111
Height="600"
1212
Title="Stream Companion">
1313
<Window.Resources>
@@ -88,7 +88,8 @@
8888
<TextBox controls:TextBoxHelper.Watermark="Search..."
8989
Margin="6"
9090
Width="400"
91-
HorizontalAlignment="Right"/>
91+
HorizontalAlignment="Right"
92+
IsEnabled="False"/>
9293
<Grid Grid.Row="1">
9394
<TabControl TabStripPlacement="Left"
9495
Background="White"
@@ -105,7 +106,7 @@
105106
<TabItem Header="Statistics">
106107
<uics:StatisticUic/>
107108
</TabItem>
108-
<TabItem Header="Search">
109+
<TabItem Header="Search" IsEnabled="False">
109110
<GroupBox Header="">
110111
</GroupBox>
111112
</TabItem>

‎src/app/ShellView.xaml.cs

-26
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,5 @@ public ShellView(IShellViewModel viewModel)
1212
this.DataContext = viewModel;
1313
this.Title = string.Format("{0} - {1}", this.Title, Application.ProductVersion);
1414
}
15-
16-
//private async void CheckForNewVersion()
17-
//{
18-
// GitHubClient client = new GitHubClient(new ProductHeaderValue("StreamCompanion"));
19-
// var user = client.User.Get("dreanor");
20-
// var releases = await client.Release.GetAll("dreanor", "StreamCompanion");
21-
// var latest = releases[0];
22-
23-
// if (!latest.TagName.Equals(Application.ProductVersion.ToString()))
24-
// {
25-
// string releaseUrl = "https://github.com/dreanor/StreamCompanion/releases/tag/" + latest.TagName;
26-
27-
// this.MetroDialogOptions.ColorScheme = MetroDialogColorScheme.Theme;
28-
// this.MetroDialogOptions.NegativeButtonText = "Not now";
29-
// this.MetroDialogOptions.AffirmativeButtonText = "Visit GitHub";
30-
31-
// var result = await this.ShowMessageAsync("New Version!", "A new release is available for download on GitHub.",
32-
// MessageDialogStyle.AffirmativeAndNegative,
33-
// this.MetroDialogOptions);
34-
35-
// if(result == MessageDialogResult.Affirmative)
36-
// {
37-
// Process.Start(releaseUrl);
38-
// }
39-
// }
40-
//}
4115
}
4216
}

‎src/jsonconverter/jsonconverter.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
<SpecificVersion>False</SpecificVersion>
4444
<HintPath>..\..\lib\Helper\helper.mvvm.dll</HintPath>
4545
</Reference>
46-
<Reference Include="helper.utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
46+
<Reference Include="helper.utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\..\lib\Helper\helper.utils.dll</HintPath>
49+
</Reference>
4750
<Reference Include="Newtonsoft.Json">
4851
<HintPath>..\..\lib\JsonNet40\Newtonsoft.Json.dll</HintPath>
4952
</Reference>

‎src/uic/StatisticTab/StatisticUic.xaml

+41-31
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,54 @@
66
xmlns:local="clr-namespace:StreamCompanion.Uic"
77
mc:Ignorable="d"
88
d:DesignHeight="800" d:DesignWidth="300">
9-
<StackPanel>
10-
<GroupBox Header="List">
11-
<Grid>
12-
<Grid.RowDefinitions>
13-
<RowDefinition/>
14-
<RowDefinition/>
15-
<RowDefinition/>
16-
</Grid.RowDefinitions>
17-
<Grid.ColumnDefinitions>
18-
<ColumnDefinition Width="auto"/>
19-
<ColumnDefinition/>
20-
</Grid.ColumnDefinitions>
21-
<Label Grid.Row="0"
9+
<ScrollViewer>
10+
<Grid>
11+
<Grid.RowDefinitions>
12+
<RowDefinition Height="auto"/>
13+
<RowDefinition Height="auto"/>
14+
</Grid.RowDefinitions>
15+
<ScrollViewer>
16+
17+
</ScrollViewer>
18+
<GroupBox Header="List">
19+
<Grid>
20+
<Grid.RowDefinitions>
21+
<RowDefinition/>
22+
<RowDefinition/>
23+
<RowDefinition/>
24+
</Grid.RowDefinitions>
25+
<Grid.ColumnDefinitions>
26+
<ColumnDefinition Width="auto"/>
27+
<ColumnDefinition/>
28+
</Grid.ColumnDefinitions>
29+
<Label Grid.Row="0"
2230
Content="Serie count"/>
23-
<Label Grid.Row="1"
31+
<Label Grid.Row="1"
2432
Content="Episode count"/>
25-
<Label Grid.Row="2"
33+
<Label Grid.Row="2"
2634
Content="Mean score"/>
27-
<Label Grid.Row="0"
35+
<Label Grid.Row="0"
2836
Grid.Column="1"
2937
Content="{Binding Path=Statistic.SerieCount}"/>
30-
<Label Grid.Row="1"
38+
<Label Grid.Row="1"
3139
Grid.Column="1"
3240
Content="{Binding Path=Statistic.EpisodeCount}"/>
33-
<Label Grid.Row="2"
41+
<Label Grid.Row="2"
3442
Grid.Column="1"
3543
Content="{Binding Path=Statistic.MeanScore}"/>
36-
</Grid>
37-
</GroupBox>
38-
<GroupBox Header="Score distribution">
39-
<Grid>
40-
<DataGrid ItemsSource="{Binding Path=Statistic.ScoreDistribution}" AutoGenerateColumns="False">
41-
<DataGrid.Columns>
42-
<DataGridTextColumn Header="Rating" Binding="{Binding Key}" />
43-
<DataGridTextColumn Header="Series" Binding="{Binding Value}" />
44-
</DataGrid.Columns>
45-
</DataGrid>
46-
</Grid>
47-
</GroupBox>
48-
</StackPanel>
44+
</Grid>
45+
</GroupBox>
46+
<GroupBox Header="Score distribution"
47+
Grid.Row="1">
48+
<Grid>
49+
<DataGrid ItemsSource="{Binding Path=Statistic.ScoreDistribution}" AutoGenerateColumns="False" IsReadOnly="True" ScrollViewer.CanContentScroll="False">
50+
<DataGrid.Columns>
51+
<DataGridTextColumn Header="Rating" Binding="{Binding Key}" />
52+
<DataGridTextColumn Header="Series" Binding="{Binding Value}" />
53+
</DataGrid.Columns>
54+
</DataGrid>
55+
</Grid>
56+
</GroupBox>
57+
</Grid>
58+
</ScrollViewer>
4959
</UserControl>

0 commit comments

Comments
 (0)