Skip to content

Commit f7ed642

Browse files
FoxTesFoxTes
committed
Clear project.
1 parent 1986155 commit f7ed642

File tree

10 files changed

+6
-121
lines changed

10 files changed

+6
-121
lines changed

‎SmartThermo.sln‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartThermo.Modules.Dialog.
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartThermo.SmartThermo.Core.Tests", "tests\SmartThermo.SmartThermo.Core.Tests\SmartThermo.SmartThermo.Core.Tests.csproj", "{A80C5CCC-2D81-42E9-ABAE-F179035B814B}"
3737
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartThermo.Modules.Settings", "src\Modules\SmartThermo.Modules.Settings\SmartThermo.Modules.Settings.csproj", "{FD4B6973-C275-4816-A175-9518EC72F6EB}"
39-
EndProject
4038
Global
4139
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4240
Debug|Any CPU = Debug|Any CPU
@@ -179,18 +177,6 @@ Global
179177
{A80C5CCC-2D81-42E9-ABAE-F179035B814B}.Release|x64.Build.0 = Release|Any CPU
180178
{A80C5CCC-2D81-42E9-ABAE-F179035B814B}.Release|x86.ActiveCfg = Release|Any CPU
181179
{A80C5CCC-2D81-42E9-ABAE-F179035B814B}.Release|x86.Build.0 = Release|Any CPU
182-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
183-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
184-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|x64.ActiveCfg = Debug|Any CPU
185-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|x64.Build.0 = Debug|Any CPU
186-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|x86.ActiveCfg = Debug|Any CPU
187-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Debug|x86.Build.0 = Debug|Any CPU
188-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
189-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|Any CPU.Build.0 = Release|Any CPU
190-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|x64.ActiveCfg = Release|Any CPU
191-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|x64.Build.0 = Release|Any CPU
192-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|x86.ActiveCfg = Release|Any CPU
193-
{FD4B6973-C275-4816-A175-9518EC72F6EB}.Release|x86.Build.0 = Release|Any CPU
194180
EndGlobalSection
195181
GlobalSection(SolutionProperties) = preSolution
196182
HideSolutionNode = FALSE
@@ -210,7 +196,6 @@ Global
210196
{707F9F26-F30A-4EE6-B80C-FB4D94428467} = {87BD6B81-EF1B-478E-BBB4-A0A40B1B6119}
211197
{E8C8E4FD-80F0-4443-904A-4BF78DCA74DE} = {87BD6B81-EF1B-478E-BBB4-A0A40B1B6119}
212198
{A80C5CCC-2D81-42E9-ABAE-F179035B814B} = {D7FE162C-D6BC-4F89-8DF9-1AEF427FA63B}
213-
{FD4B6973-C275-4816-A175-9518EC72F6EB} = {87BD6B81-EF1B-478E-BBB4-A0A40B1B6119}
214199
EndGlobalSection
215200
GlobalSection(ExtensibilityGlobals) = postSolution
216201
SolutionGuid = {B511AF63-B8BD-4505-A278-DA0B0CCAA472}

‎src/Modules/SmartThermo.Modules.Settings/SettingsModule.cs‎

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

‎src/Modules/SmartThermo.Modules.Settings/SmartThermo.Modules.Settings.csproj‎

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

‎src/Modules/SmartThermo.Modules.Settings/ViewModels/SettingsWindowViewModel.cs‎

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

‎src/Modules/SmartThermo.Modules.Settings/Views/SettingsWindow.xaml‎

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

‎src/Modules/SmartThermo.Modules.Settings/Views/SettingsWindow.xaml.cs‎

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

‎src/SmartThermo/App.xaml.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using SmartThermo.Modules.Dialog.SettingsPort.Views;
1616
using SmartThermo.Modules.Dialog.SettingsSensor.ViewModels;
1717
using SmartThermo.Modules.Dialog.SettingsSensor.Views;
18-
using SmartThermo.Modules.Settings;
1918
using SmartThermo.Services.DeviceConnector;
2019
using SmartThermo.Services.Notifications;
2120
using SmartThermo.Views;
@@ -94,6 +93,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
9493
containerRegistry.RegisterDialog<SettingsPortDialog, SettingsPortDialogViewModel>();
9594
containerRegistry.RegisterDialog<SettingsDeviceDialog, SettingsDeviceDialogViewModel>();
9695
containerRegistry.RegisterDialog<SettingsSensorDialog, SettingsSensorDialogViewModel>();
96+
9797
containerRegistry.RegisterDialogWindow<NotificationWindow>("NotificationWindow");
9898
containerRegistry.RegisterDialogWindow<NotificationWindowCloseButton>("NotificationWindowCloseButton");
9999
}
@@ -102,7 +102,6 @@ protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
102102
{
103103
moduleCatalog.AddModule<DataViewerModule>();
104104
moduleCatalog.AddModule<AnalyticsModule>();
105-
moduleCatalog.AddModule<SettingsModule>();
106105
}
107106
}
108107
}

‎src/SmartThermo/SmartThermo.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<ProjectReference Include="..\Modules\SmartThermo.Modules.Dialog.SettingsDevice\SmartThermo.Modules.Dialog.SettingsDevice.csproj" />
4646
<ProjectReference Include="..\Modules\SmartThermo.Modules.Dialog.SettingsPort\SmartThermo.Modules.Dialog.SettingsPort.csproj" />
4747
<ProjectReference Include="..\Modules\SmartThermo.Modules.Dialog.SettingsSensor\SmartThermo.Modules.Dialog.SettingsSensor.csproj" />
48-
<ProjectReference Include="..\Modules\SmartThermo.Modules.Settings\SmartThermo.Modules.Settings.csproj" />
4948
<ProjectReference Include="..\Services\SmartThermo.Services.DeviceConnector\SmartThermo.Services.DeviceConnector.csproj" />
5049
<ProjectReference Include="..\Services\SmartThermo.Services.Notifications\SmartThermo.Services.Notifications.csproj" />
5150
<ProjectReference Include="..\SmartThermo.Core\SmartThermo.Core.csproj" />

‎src/SmartThermo/ViewModels/MainWindowViewModel.cs‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,18 +192,11 @@ private static void AboutExecute()
192192

193193
private void NavigationViewInvokedExecute(NavigationViewItemInvokedEventArgs obj)
194194
{
195-
if (obj.IsSettingsInvoked)
196-
{
197-
LabelView = "Настройки";
198-
RegionManager.RequestNavigate(RegionNames.MainContent, "SettingsWindow");
199-
}
200-
else
201-
{
202-
LabelView = obj.InvokedItem.ToString();
195+
LabelView = obj.InvokedItem.ToString();
196+
197+
var nameRegion = obj.InvokedItemContainer.Tag.ToString();
198+
RegionManager.RequestNavigate(RegionNames.MainContent, nameRegion);
203199

204-
var nameRegion = obj.InvokedItemContainer.Tag.ToString();
205-
RegionManager.RequestNavigate(RegionNames.MainContent, nameRegion);
206-
}
207200
}
208201

209202
#endregion

‎src/SmartThermo/Views/MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
Background="{DynamicResource SystemControlPageBackgroundChromeLowBrush}"
4141
IsBackButtonVisible="Collapsed"
4242
IsPaneOpen="False"
43-
IsSettingsVisible="false"
43+
IsSettingsVisible="False"
4444
PaneTitle="SmartThermo">
4545

4646
<i:Interaction.Triggers>

0 commit comments

Comments
 (0)