Skip to content

Commit

Permalink
na notify changes compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgth
mgth committed Aug 16, 2016
1 parent 07173cc commit 232427c
Show file tree
Hide file tree
Showing 132 changed files with 110,102 additions and 1,362 deletions.
1,038 changes: 1,038 additions & 0 deletions .vs/config/applicationhost.config
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Argyll/Argyll.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LittleBigMouse\NotifyChange\NotifyChange.csproj">
<Project>{bfeab5f5-443e-4f0e-85ee-a4bb3aeeea4d}</Project>
<ProjectReference Include="..\..\NotifyChange\NotifyChange\NotifyChange.csproj">
<Project>{2ae41f7c-3c65-4d85-a184-3adffd40d8e2}</Project>
<Name>NotifyChange</Name>
</ProjectReference>
</ItemGroup>
Expand Down
40 changes: 16 additions & 24 deletions Argyll/ArgyllProbe.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,63 +49,55 @@ private static void ArgyllSendKey(Process p, String key)
p.StandardInput.Flush();
}

private string _name = "new";
private bool _calibrating = false;
private bool _spectrum = false;
private double _spectrumFrom = 0;
private double _spectrumTo = 0;
private int _spectrumSteps = 0;
private double _cct = 0;
private double _cri = 0;
private double _tlci = 0;
private double _lux = 0;

public string Name
{
get { return _name; }
set { SetProperty(ref _name, value); }
get { return GetProperty<string>(); }
set { SetProperty(value); }
}

public double SpectrumFrom
{
get { return _spectrumFrom; }
set { SetProperty(ref _spectrumFrom, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public double SpectrumTo
{
get { return _spectrumTo; }
set { SetProperty(ref _spectrumTo, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public int SpectrumSteps
{
get { return _spectrumSteps; }
set { SetProperty(ref _spectrumSteps, value); }
get { return GetProperty<int>(); }
set { SetProperty(value); }
}

public double Cct
{
get { return _cct; }
set { SetProperty(ref _cct, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public double Cri
{
get { return _cri; }
set { SetProperty(ref _cri, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public double Tlci
{
get { return _tlci; }
set { SetProperty(ref _tlci, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public double Lux
{
get { return _lux; }
set { SetProperty(ref _lux, value); }
get { return GetProperty<double>(); }
set { SetProperty(value); }
}

public ObservableCollection<double> Spectrum { get; set; } = new ObservableCollection<double> {0};
Expand Down
374 changes: 374 additions & 0 deletions CodeMap1.dgml
View file

Large diffs are not rendered by default.

44 changes: 35 additions & 9 deletions LittleBigMouse.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskService", "TaskService\TaskService.csproj", "{81B5ABCC-6909-483D-8BB3-84B52E3C7043}"
EndProject
Expand All @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleBigMon_Control", "Lit
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NativeHelpers", "NativeHelpers\NativeHelpers.vcxproj", "{938E65D0-EC9C-4181-87CA-A43D4747610D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifyChange", "NotifyChange\NotifyChange.csproj", "{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Argyll", "Argyll\Argyll.csproj", "{444F1148-7014-469B-8809-834FEDA0F730}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAPI", "NativeMethods\WinAPI.csproj", "{641054C2-F89B-4ABE-97B4-EE841556E999}"
Expand All @@ -23,93 +21,121 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsMonitors", "WindowsM
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitorVcp", "MonitorVcp\MonitorVcp.csproj", "{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifyChange", "..\NotifyChange\NotifyChange\NotifyChange.csproj", "{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|Any CPU.ActiveCfg = Debug|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.ActiveCfg = Debug|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x64.Build.0 = Debug|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x86.ActiveCfg = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Debug|x86.Build.0 = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|Any CPU.ActiveCfg = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|x64.ActiveCfg = Release|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|x64.Build.0 = Release|x64
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|x86.ActiveCfg = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|x86.Build.0 = Release|x86
{81B5ABCC-6909-483D-8BB3-84B52E3C7043}.Release|x86.Deploy.0 = Release|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Debug|Any CPU.ActiveCfg = Debug|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Debug|x64.ActiveCfg = Debug|x64
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Debug|x64.Build.0 = Debug|x64
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Debug|x86.ActiveCfg = Debug|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Debug|x86.Build.0 = Debug|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Release|Any CPU.ActiveCfg = Release|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Release|x64.ActiveCfg = Release|x64
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Release|x64.Build.0 = Release|x64
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Release|x86.ActiveCfg = Release|x86
{3FBBF289-0B82-4089-80CA-67977A808C5D}.Release|x86.Build.0 = Release|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Debug|Any CPU.ActiveCfg = Debug|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Debug|x64.ActiveCfg = Debug|x64
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Debug|x64.Build.0 = Debug|x64
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Debug|x86.ActiveCfg = Debug|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Debug|x86.Build.0 = Debug|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Release|Any CPU.ActiveCfg = Release|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Release|x64.ActiveCfg = Release|x64
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Release|x64.Build.0 = Release|x64
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Release|x86.ActiveCfg = Release|x86
{CEA3E9DF-4011-4041-BCCF-6318DC7E76F4}.Release|x86.Build.0 = Release|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Debug|Any CPU.ActiveCfg = Debug|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Debug|x64.ActiveCfg = Debug|x64
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Debug|x64.Build.0 = Debug|x64
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Debug|x86.ActiveCfg = Debug|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Debug|x86.Build.0 = Debug|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|Any CPU.ActiveCfg = Release|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x64.ActiveCfg = Release|x64
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x64.Build.0 = Release|x64
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x86.ActiveCfg = Release|x86
{7AD2B3B1-3CDD-40D6-9135-E02C37001AFB}.Release|x86.Build.0 = Release|x86
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|Any CPU.ActiveCfg = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.ActiveCfg = Debug|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x64.Build.0 = Debug|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x86.ActiveCfg = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Debug|x86.Build.0 = Debug|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|Any CPU.ActiveCfg = Release|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|x64.ActiveCfg = Release|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|x64.Build.0 = Release|x64
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|x86.ActiveCfg = Release|Win32
{938E65D0-EC9C-4181-87CA-A43D4747610D}.Release|x86.Build.0 = Release|Win32
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Debug|x64.ActiveCfg = Debug|x64
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Debug|x64.Build.0 = Debug|x64
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Debug|x86.ActiveCfg = Debug|x64
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Release|x64.ActiveCfg = Release|x64
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Release|x64.Build.0 = Release|x64
{BFEAB5F5-443E-4F0E-85EE-A4BB3AEEEA4D}.Release|x86.ActiveCfg = Release|x64
{444F1148-7014-469B-8809-834FEDA0F730}.Debug|Any CPU.ActiveCfg = Debug|x86
{444F1148-7014-469B-8809-834FEDA0F730}.Debug|x64.ActiveCfg = Debug|x64
{444F1148-7014-469B-8809-834FEDA0F730}.Debug|x64.Build.0 = Debug|x64
{444F1148-7014-469B-8809-834FEDA0F730}.Debug|x86.ActiveCfg = Debug|x86
{444F1148-7014-469B-8809-834FEDA0F730}.Debug|x86.Build.0 = Debug|x86
{444F1148-7014-469B-8809-834FEDA0F730}.Release|Any CPU.ActiveCfg = Release|x86
{444F1148-7014-469B-8809-834FEDA0F730}.Release|x64.ActiveCfg = Release|x64
{444F1148-7014-469B-8809-834FEDA0F730}.Release|x64.Build.0 = Release|x64
{444F1148-7014-469B-8809-834FEDA0F730}.Release|x86.ActiveCfg = Release|x86
{444F1148-7014-469B-8809-834FEDA0F730}.Release|x86.Build.0 = Release|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Debug|Any CPU.ActiveCfg = Debug|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Debug|x64.ActiveCfg = Debug|x64
{641054C2-F89B-4ABE-97B4-EE841556E999}.Debug|x64.Build.0 = Debug|x64
{641054C2-F89B-4ABE-97B4-EE841556E999}.Debug|x86.ActiveCfg = Debug|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Debug|x86.Build.0 = Debug|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Release|Any CPU.ActiveCfg = Release|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Release|x64.ActiveCfg = Release|x64
{641054C2-F89B-4ABE-97B4-EE841556E999}.Release|x64.Build.0 = Release|x64
{641054C2-F89B-4ABE-97B4-EE841556E999}.Release|x86.ActiveCfg = Release|x86
{641054C2-F89B-4ABE-97B4-EE841556E999}.Release|x86.Build.0 = Release|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Debug|Any CPU.ActiveCfg = Debug|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Debug|x64.ActiveCfg = Debug|x64
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Debug|x64.Build.0 = Debug|x64
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Debug|x86.ActiveCfg = Debug|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Debug|x86.Build.0 = Debug|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Release|Any CPU.ActiveCfg = Release|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Release|x64.ActiveCfg = Release|x64
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Release|x64.Build.0 = Release|x64
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Release|x86.ActiveCfg = Release|x86
{0C90E881-B94C-4DC5-B2D0-FF6DC7601DE4}.Release|x86.Build.0 = Release|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Debug|Any CPU.ActiveCfg = Debug|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Debug|x64.ActiveCfg = Debug|x64
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Debug|x64.Build.0 = Debug|x64
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Debug|x86.ActiveCfg = Debug|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Debug|x86.Build.0 = Debug|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Release|Any CPU.ActiveCfg = Release|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Release|x64.ActiveCfg = Release|x64
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Release|x64.Build.0 = Release|x64
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Release|x86.ActiveCfg = Release|x86
{543A85AB-37E8-4DB6-B51A-07B719A4DF2E}.Release|x86.Build.0 = Release|x86
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|x64.ActiveCfg = Debug|x64
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|x64.Build.0 = Debug|x64
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|x86.ActiveCfg = Debug|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Debug|x86.Build.0 = Debug|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|Any CPU.Build.0 = Release|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|x64.ActiveCfg = Release|x64
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|x64.Build.0 = Release|x64
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|x86.ActiveCfg = Release|Any CPU
{2AE41F7C-3C65-4D85-A184-3ADFFD40D8E2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 2 additions & 0 deletions LittleBigMouse.sln.DotSettings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<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">
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=LittleBigMouse_005FDaemon_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
8 changes: 4 additions & 4 deletions LittleBigMouse_Control/LittleBigMon_Control.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\NotifyChange\NotifyChange\NotifyChange.csproj">
<Project>{2ae41f7c-3c65-4d85-a184-3adffd40d8e2}</Project>
<Name>NotifyChange</Name>
</ProjectReference>
<ProjectReference Include="..\Argyll\Argyll.csproj">
<Project>{444f1148-7014-469b-8809-834feda0f730}</Project>
<Name>Argyll</Name>
Expand All @@ -307,10 +311,6 @@
<Project>{938e65d0-ec9c-4181-87ca-a43d4747610d}</Project>
<Name>NativeHelpers</Name>
</ProjectReference>
<ProjectReference Include="..\NotifyChange\NotifyChange.csproj">
<Project>{bfeab5f5-443e-4f0e-85ee-a4bb3aeeea4d}</Project>
<Name>NotifyChange</Name>
</ProjectReference>
<ProjectReference Include="..\ScreenConfig\LbmScreenConfig.csproj">
<Project>{3fbbf289-0b82-4089-80ca-67977a808c5d}</Project>
<Name>LbmScreenConfig</Name>
Expand Down
2 changes: 1 addition & 1 deletion LittleBigMouse_Control/MainView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MainView()
{
InitializeComponent();
}
catch (System.Windows.Markup.XamlParseException ex)
catch (System.Windows.Markup.XamlParseException)
{

}
Expand Down
21 changes: 8 additions & 13 deletions LittleBigMouse_Control/MainViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ namespace LittleBigMouse_Control
{
internal class MainViewModel : ViewModel
{
public override Type ViewType => typeof (MainView);
//public override Type ViewType => typeof (MainView);

public MainViewModel()
{
CloseCommand = new CloseCommand(this);
MaximizeCommand = new MaximizeCommand(this);

Plugins.CollectionChanged += Plugins_CollectionChanged;

InitNotifier();
}

private void Plugins_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
Expand All @@ -38,28 +36,25 @@ private void Plugins_CollectionChanged(object sender, System.Collections.Special

//private GetScreenControlViewModelDelegate _getScreenControlView;

private ScreenConfig _config;
public ScreenConfig Config
{
get { return _config; }
set { SetProperty(ref _config, value); }
get { return GetProperty<ScreenConfig>(); }
set { SetProperty(value); }
}


private ViewModel _control;
public ViewModel Control
{
get { return _control; }
set { SetProperty(ref _control, value);}
get { return GetProperty<ViewModel>(); }
set { SetProperty(value);}
}

private PresenterViewModel _presenter;
public PresenterViewModel Presenter
{
get { return _presenter; }
get { return GetProperty<PresenterViewModel>(); }
set
{
if (SetAndWatch(ref _presenter, value))
if (SetAndWatch(value))
{
Presenter.MainViewModel = this;
}
Expand Down Expand Up @@ -101,7 +96,7 @@ public void Maximize()
w.WindowState = WindowState.Normal;
}
}
public void UnMaximaze()
public void UnMaximize()
{
Window w = (View as Window);
if (w != null)
Expand Down
2 changes: 0 additions & 2 deletions LittleBigMouse_Control/MultiScreensViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public MultiScreensViewModel()
{
ScreensCanvas.SizeChanged += (sender, args) => RaiseProperty("Size");
ScreenFrames.CollectionChanged += ScreenFrames_CollectionChanged;

InitNotifier();
}

private void ScreenFrames_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
Expand Down
Loading

0 comments on commit 232427c

Please sign in to comment.