Skip to content

Commit 3e42453

Browse files
author
Ahmad Noman Musleh
committed
Merged UI to main library
1 parent 6598aeb commit 3e42453

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+4671
-27
lines changed

‎cAlgo.API.Alert.sln‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 16.0.29806.167
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alert", "src\Alert\Alert.csproj", "{67AD1D85-119E-4984-A642-AE502BC4AF27}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{63C5A465-9969-4271-8B6C-E37296007BA8} = {63C5A465-9969-4271-8B6C-E37296007BA8}
9-
EndProjectSection
10-
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "src\UI\UI.csproj", "{63C5A465-9969-4271-8B6C-E37296007BA8}"
127
EndProject
138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FA566F4F-3EFA-4C4A-9AA3-3DC3B4275C73}"
149
EndProject
@@ -18,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B40FBA14-5
1813
EndProject
1914
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UITestConsole", "test\UITestConsole\UITestConsole.csproj", "{82149BBC-B6BD-45F5-800E-6AB538F82336}"
2015
ProjectSection(ProjectDependencies) = postProject
21-
{63C5A465-9969-4271-8B6C-E37296007BA8} = {63C5A465-9969-4271-8B6C-E37296007BA8}
2216
{67AD1D85-119E-4984-A642-AE502BC4AF27} = {67AD1D85-119E-4984-A642-AE502BC4AF27}
2317
EndProjectSection
2418
EndProject
@@ -32,10 +26,6 @@ Global
3226
{67AD1D85-119E-4984-A642-AE502BC4AF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
3327
{67AD1D85-119E-4984-A642-AE502BC4AF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
3428
{67AD1D85-119E-4984-A642-AE502BC4AF27}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{63C5A465-9969-4271-8B6C-E37296007BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{63C5A465-9969-4271-8B6C-E37296007BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{63C5A465-9969-4271-8B6C-E37296007BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{63C5A465-9969-4271-8B6C-E37296007BA8}.Release|Any CPU.Build.0 = Release|Any CPU
3929
{82149BBC-B6BD-45F5-800E-6AB538F82336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4030
{82149BBC-B6BD-45F5-800E-6AB538F82336}.Debug|Any CPU.Build.0 = Debug|Any CPU
4131
{82149BBC-B6BD-45F5-800E-6AB538F82336}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -46,7 +36,6 @@ Global
4636
EndGlobalSection
4737
GlobalSection(NestedProjects) = preSolution
4838
{67AD1D85-119E-4984-A642-AE502BC4AF27} = {FA566F4F-3EFA-4C4A-9AA3-3DC3B4275C73}
49-
{63C5A465-9969-4271-8B6C-E37296007BA8} = {FA566F4F-3EFA-4C4A-9AA3-3DC3B4275C73}
5039
{82149BBC-B6BD-45F5-800E-6AB538F82336} = {B40FBA14-592C-4E0F-8EE1-7945F9B1C618}
5140
EndGlobalSection
5241
GlobalSection(ExtensibilityGlobals) = postSolution

‎src/Alert/Alert.csproj‎

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
<Reference Include="cAlgo.API">
3939
<HintPath>..\..\..\..\..\Documents\cAlgo\API\cAlgo.API.dll</HintPath>
4040
</Reference>
41-
<Reference Include="cAlgo.API.Alert.UI, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\cAlgo.API.Alert.UI.2.2.1\lib\net45\cAlgo.API.Alert.UI.dll</HintPath>
43-
</Reference>
4441
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
4542
<HintPath>..\..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
4643
</Reference>
@@ -86,19 +83,70 @@
8683
<Reference Include="WindowsBase" />
8784
</ItemGroup>
8885
<ItemGroup>
86+
<Compile Include="App.cs" />
87+
<Compile Include="Behaviors\DataGridColumnSettingsBehavior.cs" />
88+
<Compile Include="Behaviors\ScrollToItemBehavior.cs" />
89+
<Compile Include="Converters\EnumToDescription.cs" />
90+
<Compile Include="Converters\EnumToInt.cs" />
91+
<Compile Include="Enums\DataGridColumnSettingsType.cs" />
92+
<Compile Include="Enums\TimeFormat.cs" />
93+
<Compile Include="Events\AlertAddedEvent.cs" />
94+
<Compile Include="Events\AlertRemovedEvent.cs" />
95+
<Compile Include="Events\AlertSettingsChangedEvent.cs" />
96+
<Compile Include="Events\EmailSettingsChangedEvent.cs" />
97+
<Compile Include="Events\GeneralSettingsChangedEvent.cs" />
98+
<Compile Include="Events\SettingsChangedEvent.cs" />
99+
<Compile Include="Events\SoundSettingsChangedEvent.cs" />
100+
<Compile Include="Events\TelegramSettingsChangedEvent.cs" />
101+
<Compile Include="Factories\SettingsFactory.cs" />
102+
<Compile Include="Models\AboutModel.cs" />
103+
<Compile Include="Models\AlertModel.cs" />
104+
<Compile Include="Models\AlertSettingsModel.cs" />
89105
<Compile Include="Models\Configuration.cs" />
90106
<Compile Include="Launcher.cs" />
91107
<Compile Include="INotificationsExtensions.cs" />
108+
<Compile Include="Models\DataGridColumnSettingsModels.cs" />
109+
<Compile Include="Models\DataGridLengthSettingsModels.cs" />
110+
<Compile Include="Models\EmailSettingsModel.cs" />
111+
<Compile Include="Models\EmailTemplateModel.cs" />
112+
<Compile Include="Models\FontModel.cs" />
113+
<Compile Include="Models\FontStyleModel.cs" />
114+
<Compile Include="Models\FontWeightModel.cs" />
115+
<Compile Include="Models\GeneralSettingsModel.cs" />
116+
<Compile Include="Models\SettingsModel.cs" />
117+
<Compile Include="Models\SoundSettingsModel.cs" />
118+
<Compile Include="Models\TelegramConversation.cs" />
119+
<Compile Include="Models\TelegramSettingsModel.cs" />
120+
<Compile Include="Models\ThemeAccentModel.cs" />
121+
<Compile Include="Models\ThemeBaseModel.cs" />
92122
<Compile Include="Properties\AssemblyInfo.cs" />
93123
<Compile Include="Properties\Settings.Designer.cs">
94124
<AutoGen>True</AutoGen>
95125
<DesignTimeSharedInput>True</DesignTimeSharedInput>
96126
<DependentUpon>Settings.settings</DependentUpon>
97127
</Compile>
98128
<Compile Include="DataManager.cs" />
129+
<Compile Include="Settings\DataGridSettings.cs" />
99130
<Compile Include="Utility\ExceptionTools.cs" />
100131
<Compile Include="Utility\Logger.cs" />
101132
<Compile Include="Utility\Serializer.cs" />
133+
<Compile Include="ViewModels\AboutViewModel.cs" />
134+
<Compile Include="ViewModels\AlertsViewModel.cs" />
135+
<Compile Include="ViewModels\SettingsViewModel.cs" />
136+
<Compile Include="ViewModels\ShellViewModel.cs" />
137+
<Compile Include="ViewNames.cs" />
138+
<Compile Include="Views\AboutView.xaml.cs">
139+
<DependentUpon>AboutView.xaml</DependentUpon>
140+
</Compile>
141+
<Compile Include="Views\AlertsView.xaml.cs">
142+
<DependentUpon>AlertsView.xaml</DependentUpon>
143+
</Compile>
144+
<Compile Include="Views\SettingsView.xaml.cs">
145+
<DependentUpon>SettingsView.xaml</DependentUpon>
146+
</Compile>
147+
<Compile Include="Views\ShellView.xaml.cs">
148+
<DependentUpon>ShellView.xaml</DependentUpon>
149+
</Compile>
102150
</ItemGroup>
103151
<ItemGroup>
104152
<None Include="app.config" />
@@ -108,5 +156,39 @@
108156
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
109157
</None>
110158
</ItemGroup>
159+
<ItemGroup>
160+
<Page Include="Resources\AlertsViewResources.xaml">
161+
<Generator>MSBuild:Compile</Generator>
162+
<SubType>Designer</SubType>
163+
</Page>
164+
<Page Include="Resources\Icons.xaml">
165+
<Generator>MSBuild:Compile</Generator>
166+
<SubType>Designer</SubType>
167+
</Page>
168+
<Page Include="Resources\SettingsViewResources.xaml">
169+
<Generator>MSBuild:Compile</Generator>
170+
<SubType>Designer</SubType>
171+
</Page>
172+
<Page Include="Resources\SharedResources.xaml">
173+
<Generator>MSBuild:Compile</Generator>
174+
<SubType>Designer</SubType>
175+
</Page>
176+
<Page Include="Views\AboutView.xaml">
177+
<Generator>MSBuild:Compile</Generator>
178+
<SubType>Designer</SubType>
179+
</Page>
180+
<Page Include="Views\AlertsView.xaml">
181+
<Generator>MSBuild:Compile</Generator>
182+
<SubType>Designer</SubType>
183+
</Page>
184+
<Page Include="Views\SettingsView.xaml">
185+
<Generator>MSBuild:Compile</Generator>
186+
<SubType>Designer</SubType>
187+
</Page>
188+
<Page Include="Views\ShellView.xaml">
189+
<Generator>MSBuild:Compile</Generator>
190+
<SubType>Designer</SubType>
191+
</Page>
192+
</ItemGroup>
111193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112194
</Project>

0 commit comments

Comments
 (0)