Merge branch 'master' into add-NotifyIcon
This commit is contained in:
NaBian committed
commit
9ae19c9f85
156 files changed
+2866
-734
No files matched your search
@@ -130,9 +130,15 @@
|
||||
<Compile Include="UserControl\Basic\ChatBox.xaml.cs">
|
||||
<DependentUpon>ChatBox.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Basic\TextDialog.xaml.cs">
|
||||
<DependentUpon>TextDialog.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\AnimationPathDemoCtl.xaml.cs">
|
||||
<DependentUpon>AnimationPathDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\BadgeDemoCtl.xaml.cs">
|
||||
<DependentUpon>BadgeDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\CalendarWithClockDemoCtl.xaml.cs">
|
||||
<DependentUpon>CalendarWithClockDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -145,8 +151,11 @@
|
||||
<Compile Include="UserControl\Controls\CirclePanelDemoCtl.xaml.cs">
|
||||
<DependentUpon>CirclePanelDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\CircleProgressBarDemoCtl.xaml.cs">
|
||||
<DependentUpon>CircleProgressBarDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Controls\DialogDemoCtl.xaml.cs">
|
||||
<DependentUpon>DialogDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\ProgressBarDemoCtl.xaml.cs">
|
||||
<DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\ClockDemoCtl.xaml.cs">
|
||||
<DependentUpon>ClockDemoCtl.xaml</DependentUpon>
|
||||
@@ -180,6 +189,8 @@
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\NotifyIconDemoCtl.xaml.cs">
|
||||
<DependentUpon>NotifyIconDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Controls\GravatarDemoCtl.xaml.cs">
|
||||
<DependentUpon>GravatarDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\OutlineTextDemoCtl.xaml.cs">
|
||||
<DependentUpon>OutlineTextDemoCtl.xaml</DependentUpon>
|
||||
@@ -250,6 +261,9 @@
|
||||
<Compile Include="UserControl\Main\QQGroupView.xaml.cs">
|
||||
<DependentUpon>QQGroupView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Main\UnderConstruction.xaml.cs">
|
||||
<DependentUpon>UnderConstruction.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\BorderDemoCtl.xaml.cs">
|
||||
<DependentUpon>BorderDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
@@ -274,14 +288,14 @@
|
||||
<Compile Include="UserControl\Styles\ListViewDemoCtl.xaml.cs">
|
||||
<DependentUpon>ListViewDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaiveComboBoxDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeComboBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeComboBoxDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\DataGridDemoCtl.xaml.cs">
|
||||
<DependentUpon>DataGridDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaiveDatePickerDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaiveDatePickerDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeDatePickerDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeDatePickerDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\ExpanderDemoCtl.xaml.cs">
|
||||
<DependentUpon>ExpanderDemoCtl.xaml</DependentUpon>
|
||||
@@ -304,17 +318,17 @@
|
||||
<Compile Include="UserControl\Styles\MenuDemoCtl.xaml.cs">
|
||||
<DependentUpon>MenuDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaiveScrollViewerDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaiveScrollViewerDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeScrollViewerDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeScrollViewerDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaiveTabControlDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaiveTabControlDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeTabControlDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeTabControlDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaivePasswordBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaivePasswordBoxDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativePasswordBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativePasswordBoxDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\ProgressBarDemoCtl.xaml.cs">
|
||||
<DependentUpon>ProgressBarDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeProgressBarDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeProgressBarDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Controls\TabControlDemoCtl.xaml.cs">
|
||||
<DependentUpon>TabControlDemoCtl.xaml</DependentUpon>
|
||||
@@ -331,8 +345,8 @@
|
||||
<Compile Include="UserControl\Styles\TextBlockDemoCtl.xaml.cs">
|
||||
<DependentUpon>TextBlockDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\NaiveTextBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NaiveTextBoxDemoCtl.xaml</DependentUpon>
|
||||
<Compile Include="UserControl\Styles\NativeTextBoxDemoCtl.xaml.cs">
|
||||
<DependentUpon>NativeTextBoxDemoCtl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControl\Styles\ToggleButtonDemoCtl.xaml.cs">
|
||||
<DependentUpon>ToggleButtonDemoCtl.xaml</DependentUpon>
|
||||
@@ -346,6 +360,7 @@
|
||||
<Compile Include="ViewModel\Basic\ChatBoxViewModel.cs" />
|
||||
<Compile Include="ViewModel\Common\ComboBoxDemoViewModel.cs" />
|
||||
<Compile Include="ViewModel\Controls\CoverViewModel.cs" />
|
||||
<Compile Include="ViewModel\Controls\DialogDemoViewModel.cs" />
|
||||
<Compile Include="ViewModel\DemoViewModelBase!1.cs" />
|
||||
<Compile Include="ViewModel\Main\ContributorsViewModel.cs" />
|
||||
<Compile Include="ViewModel\Controls\GrowlDemoViewModel.cs" />
|
||||
@@ -434,10 +449,18 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Basic\TextDialog.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\AnimationPathDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\BadgeDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\CalendarWithClockDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -454,7 +477,11 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\CircleProgressBarDemoCtl.xaml">
|
||||
<Page Include="UserControl\Controls\DialogDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\ProgressBarDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -502,6 +529,10 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\GravatarDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Controls\OutlineTextDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -594,6 +625,10 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Main\UnderConstruction.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\BorderDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
@@ -626,7 +661,7 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaiveComboBoxDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeComboBoxDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -634,7 +669,7 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaiveDatePickerDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeDatePickerDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -666,19 +701,19 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaiveScrollViewerDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeScrollViewerDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaiveTabControlDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeTabControlDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaivePasswordBoxDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativePasswordBoxDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\ProgressBarDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeProgressBarDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -702,7 +737,7 @@
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControl\Styles\NaiveTextBoxDemoCtl.xaml">
|
||||
<Page Include="UserControl\Styles\NativeTextBoxDemoCtl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
@@ -761,6 +796,10 @@
|
||||
<LastGenOutput>MessageToken.cs</LastGenOutput>
|
||||
</Content>
|
||||
<Resource Include="Resources\Img\LeftMainContent\NotificationHub_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\Dialog_16x.png" />
|
||||
<Resource Include="Resources\Img\under_construction.gif" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\User_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\DotLarge_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\GoToTop_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\Label_16x.png" />
|
||||
<Resource Include="Resources\Img\Chat\chat_back1.jpg" />
|
||||
@@ -827,7 +866,6 @@
|
||||
<Resource Include="Resources\Img\LeftMainContent\Flow_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\TimePicker_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\Time_color_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\ShapeArcRing_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\NumericListBox_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\Toggle_16x.png" />
|
||||
<Resource Include="Resources\Img\LeftMainContent\DataGrid_16x.png" />
|
||||
|
||||
Reference in new issue
Block a user