Skip to content

Commit 05457d5

Browse files
veigrveigr
committed
ToolView調整
1 parent ab6cdb5 commit 05457d5

4 files changed

Lines changed: 47 additions & 20 deletions

File tree

‎LvChartPlugin/ChartWindow.xaml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,7 @@
2020
TextOptions.TextFormattingMode="Display">
2121

2222
<metro:MetroWindow.Resources>
23-
<ResourceDictionary>
24-
<ResourceDictionary.MergedDictionaries>
25-
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Styles/Controls.xaml" />
26-
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Styles/Icons.xaml" />
27-
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Themes/Dark.xaml" />
28-
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Themes/Accents/Purple.xaml" />
29-
30-
<ResourceDictionary Source="pack://application:,,,/Desktop.Metro;component/Styles/Controls.xaml" />
31-
32-
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Styles/Colors.xaml" />
33-
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Styles/Controls.xaml" />
34-
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Themes/Generic.xaml" />
35-
</ResourceDictionary.MergedDictionaries>
36-
</ResourceDictionary>
23+
<ResourceDictionary Source="Styles/PluginStyle.xaml"/>
3724
</metro:MetroWindow.Resources>
3825

3926
<metro:MetroWindow.DataContext>

‎LvChartPlugin/LvChartPlugin.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,16 @@
150150
<SubType>Designer</SubType>
151151
<Generator>MSBuild:Compile</Generator>
152152
</Page>
153+
<Page Include="Styles\PluginStyle.xaml">
154+
<SubType>Designer</SubType>
155+
<Generator>MSBuild:Compile</Generator>
156+
</Page>
153157
<Page Include="ToolView.xaml">
154158
<SubType>Designer</SubType>
155159
<Generator>MSBuild:Compile</Generator>
156160
</Page>
157161
</ItemGroup>
162+
<ItemGroup />
158163
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
159164
<PropertyGroup>
160165
<PostBuildEvent>mkdir $(SolutionDir)Grabacr07.KanColleViewer\bin\$(ConfigurationName)\Plugins

‎LvChartPlugin/Styles/PluginStyle.xaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3+
4+
<ResourceDictionary.MergedDictionaries>
5+
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Styles/Controls.xaml" />
6+
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Styles/Icons.xaml" />
7+
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Themes/Dark.xaml" />
8+
<ResourceDictionary Source="pack://application:,,,/MetroRadiance;component/Themes/Accents/Purple.xaml" />
9+
10+
<ResourceDictionary Source="pack://application:,,,/Desktop.Metro;component/Styles/Controls.xaml" />
11+
12+
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Styles/Colors.xaml" />
13+
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Styles/Controls.xaml" />
14+
<ResourceDictionary Source="pack://application:,,,/KanColleViewer;component/Themes/Generic.xaml" />
15+
</ResourceDictionary.MergedDictionaries>
16+
</ResourceDictionary>

‎LvChartPlugin/ToolView.xaml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:charting="clr-namespace:System.Windows.Forms.DataVisualization.Charting;assembly=System.Windows.Forms.DataVisualization"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
76
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
87
xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
98
xmlns:livet="http://schemas.livet-mvvm.net/2011/wpf"
109
xmlns:lvChartPlugin="clr-namespace:LvChartPlugin"
1110
mc:Ignorable="d"
1211
d:DesignHeight="300" d:DesignWidth="300">
12+
13+
<UserControl.Resources>
14+
<ResourceDictionary Source="Styles/PluginStyle.xaml"/>
15+
</UserControl.Resources>
16+
1317
<i:Interaction.Triggers>
1418

1519
<livet:InteractionMessageTrigger Messenger="{Binding Messenger}"
@@ -20,10 +24,25 @@
2024
</livet:InteractionMessageTrigger>
2125
</i:Interaction.Triggers>
2226
<Grid>
23-
<Button Content="Open Chart Window"
24-
VerticalAlignment="Center"
25-
HorizontalAlignment="Center"
26-
Padding="20">
27+
<Grid.RowDefinitions>
28+
<RowDefinition Height="Auto"/>
29+
<RowDefinition/>
30+
</Grid.RowDefinitions>
31+
32+
<Border Grid.Row="0"
33+
BorderThickness="0,0,0,1"
34+
BorderBrush="{DynamicResource ActiveBorderBrushKey}">
35+
<TextBlock Text="艦娘 Level チャート"
36+
Style="{DynamicResource HeaderTextStyleKey}"
37+
Margin="10,0,10,10"/>
38+
</Border>
39+
40+
<Button Grid.Row="1"
41+
Content="Open Chart Window"
42+
VerticalAlignment="Top"
43+
HorizontalAlignment="Left"
44+
Padding="20, 10"
45+
Margin="10">
2746
<i:Interaction.Triggers>
2847
<i:EventTrigger EventName="Click">
2948
<ei:CallMethodAction TargetObject="{Binding}"

0 commit comments

Comments
 (0)