lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2026-02-25 13:04:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added pluggable log (#44)

Browse Source
This commit is contained in:
Eugene Wang
2015-07-04 11:18:03 -04:00
parent 4356ed0615
commit 69d76569ff
17 changed files with 253 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/Sample.WPF/MainWindow.xaml.cs
View File

@@ -30,18 +30,18 @@ namespace Sample.WPF
{
_twainVM = this.DataContext as TwainVM;
Messenger.Default.Register<RefreshCommandsMessage>(this, m => m.HandleRefreshCommands());
Messenger.Default.Register<DialogMessage>(this, msg =>
Messenger.Default.Register<RefreshCommandsMessage>(this, m => m.HandleIt());
Messenger.Default.Register<MessageBoxMessage>(this, msg =>
{
if (Dispatcher.CheckAccess())
{
this.HandleDialogMessageModern(msg);
msg.HandleWithModern(this);
}
else
{
Dispatcher.BeginInvoke(new Action(() =>
{
this.HandleDialogMessageModern(msg);
msg.HandleWithModern(this);
}));
}
});

11
samples/Sample.WPF/Sample.WPF.csproj
View File

@@ -44,8 +44,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonWin32, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a0a4edcfe233918d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\CommonWin32.2.0.5.5\lib\net35-Client\CommonWin32.dll</HintPath>
<HintPath>..\..\packages\CommonWin32.2.0.5.6\lib\net35-Client\CommonWin32.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GalaSoft.MvvmLight, Version=5.1.1.35051, Culture=neutral, PublicKeyToken=0e453835af4ee6ce, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmLightLibs.5.1.1.0\lib\net40\GalaSoft.MvvmLight.dll</HintPath>
@@ -70,11 +70,12 @@
<HintPath>..\..\packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
</Reference>
<Reference Include="ModernWPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
<HintPath>..\..\packages\ModernWPF.1.2.10\lib\net40-Client\ModernWPF.dll</HintPath>
<HintPath>..\..\packages\ModernWPF.1.3.0\lib\net40-Client\ModernWPF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ModernWPF.Mvvm">
<HintPath>..\..\packages\ModernWPF.Mvvm.0.7.0\lib\net40-Client\ModernWPF.Mvvm.dll</HintPath>
<Reference Include="ModernWPF.Mvvm, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ModernWPF.Mvvm.0.7.3\lib\net40-Client\ModernWPF.Mvvm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />

4
samples/Sample.WPF/ViewModels/TwainVM.cs
View File

@@ -225,7 +225,7 @@ namespace Sample.WPF
{
if (e.Exception != null)
{
Messenger.Default.Send(new DialogMessage(e.Exception.Message, null)
Messenger.Default.Send(new MessageBoxMessage (e.Exception.Message, null)
{
Caption = "Transfer Error Exception",
Icon = System.Windows.MessageBoxImage.Error,
@@ -234,7 +234,7 @@ namespace Sample.WPF
}
else
{
Messenger.Default.Send(new DialogMessage(string.Format("Return Code: {0}\nCondition Code: {1}", e.ReturnCode, e.SourceStatus.ConditionCode), null)
Messenger.Default.Send(new MessageBoxMessage(string.Format("Return Code: {0}\nCondition Code: {1}", e.ReturnCode, e.SourceStatus.ConditionCode), null)
{
Caption = "Transfer Error",
Icon = System.Windows.MessageBoxImage.Error,

14
samples/Sample.WPF/packages.config
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.3" targetFramework="net40-Client" />
<package id="CommonWin32" version="2.0.5.5" targetFramework="net40-Client" />
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net40-Client" />
<package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net40-Client" />
<package id="ModernWPF" version="1.2.10" targetFramework="net40-Client" />
<package id="ModernWPF.Mvvm" version="0.7.0" targetFramework="net40-Client" />
<package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net40-Client" />
<package id="CommonServiceLocator" version="1.3" targetFramework="net4-client" userInstalled="true" />
<package id="CommonWin32" version="2.0.5.6" targetFramework="net4-client" userInstalled="true" />
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net4-client" userInstalled="true" />
<package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net4-client" userInstalled="true" />
<package id="ModernWPF" version="1.3.0" targetFramework="net4-client" userInstalled="true" />
<package id="ModernWPF.Mvvm" version="0.7.3" targetFramework="net4-client" userInstalled="true" />
<package id="MvvmLightLibs" version="5.1.1.0" targetFramework="net4-client" userInstalled="true" />
</packages>