Skip to content
This repository was archived by the owner on Apr 8, 2023. It is now read-only.

Commit ea9352b

Browse files
authored
Merge pull request #15 from cuiliang/settings
Settings
2 parents cabcba4 + d76d4df commit ea9352b

25 files changed

+2424
-548
lines changed

ClickShow.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=ClickShow_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ClickShow/App.xaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<Application x:Class="ClickShow.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:ClickShow"
5-
StartupUri="MainWindow.xaml">
6-
<Application.Resources>
7-
8-
</Application.Resources>
1+
<Application
2+
x:Class="ClickShow.App"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:local="clr-namespace:ClickShow"
6+
StartupUri="UI/MainWindow.xaml">
7+
<Application.Resources />
98
</Application>

ClickShow/App.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Configuration;
4-
using System.Data;
54
using System.Linq;
65
using System.Threading.Tasks;
76
using System.Windows;

ClickShow/ClickShow.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@
4646
</BootstrapperPackage>
4747
</ItemGroup>
4848
<ItemGroup>
49-
<Reference Include="Newtonsoft.Json">
50-
<HintPath>C:\Program Files\Quicker\Newtonsoft.Json.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Xceed.Wpf.Toolkit">
53-
<HintPath>bin\Debug\net472\Xceed.Wpf.Toolkit.dll</HintPath>
54-
</Reference>
49+
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="4.6.97" />
5550
</ItemGroup>
5651
<ItemGroup>
5752
<Resource Include="clickshow.ico" />
@@ -69,6 +64,9 @@
6964
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
7065
</None>
7166
</ItemGroup>
67+
<ItemGroup>
68+
<Folder Include="3rd\" />
69+
</ItemGroup>
7270
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
7371
<Exec Command="if $(ConfigurationName) == ReleaseElevated (&#xD;&#xA; copy /Y &quot;$(ProjectDir)app.manifest.elevate&quot; &quot;$(ProjectDir)app.manifest&quot;&#xD;&#xA;) ELSE (&#xD;&#xA; copy /Y &quot;$(ProjectDir)app.manifest.normal&quot; &quot;$(ProjectDir)app.manifest&quot;&#xD;&#xA;)" />
7472
</Target>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

ClickShow/MainWindow.xaml

Lines changed: 0 additions & 121 deletions
This file was deleted.

ClickShow/MySlider.cs

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)